Changeset 279

Timestamp:

06/05/15 23:32:25 (9 years ago)

Author:

tim

Message:

some changes requested by debian maintainers

Location:

trunk

Files:

• SConstruct (modified) (5 diffs)
• setup.py (moved) (moved from trunk/pyregfi-distutils.py)

trunk/SConstruct

@@ -5 +5 @@
 
 cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -fvisibility=hidden'
-cflags += ' -DREGFI_VERSION=\'"%s"\'' % REGFI_VERSION
-cflags += ' -ggdb'
+cflags += ' -DREGFI_VERSION=\'"%s"\' ' % REGFI_VERSION
+cflags += os.environ.get('CFLAGS','-fPIE -pie -fstack-protector -D_FORTIFY_SOURCE=2')
+
+linkflags = "-shared -fPIC -Wl,-soname,libregfi.so.%s " % REGFI_VERSION
+linkflags += os.environ.get('LDFLAGS','-z relro -z now')
 
 lib_src = ['lib/regfi.c',
@@ -22 +25 @@
                   LIBS=['m', 'pthread', 'regfi', 'talloc'])
 
+
 # Libraries
 libregfi_static = env.Library(lib_src)
 libregfi = env.SharedLibrary(lib_src, LIBS=['m','pthread', 'talloc'], 
-                             LINKFLAGS="-shared -fPIC -Wl,-soname,libregfi.so.%s" % REGFI_VERSION)
+                             LINKFLAGS=linkflags)
 
 
@@ -65 +69 @@
 env.Install(destdir+mandir+'/man1', [man_reglookup, man_reglookup_recover,
                                      man_reglookup_timeline])
-if os.getuid() == 0:
+
+if os.getuid() == 0 and destdir == '':
    env.AddPostAction(libinstall, 'ldconfig')
 
@@ -73 +78 @@
                                         'python/pyregfi/structures.py', 
                                         'python/pyregfi/winsec.py'],
-               "python pyregfi-distutils.py install --root=/%s | tee pyregfi2-install.log" % destdir)
+               "python setup.py install --root=/%s | tee pyregfi2-install.log" % destdir)
 
 python_path = os.popen('which python3').read()
@@ -81 +86 @@
                                         'python/pyregfi/structures.py', 
                                         'python/pyregfi/winsec.py'], 
-               "python3 pyregfi-distutils.py install --root=/%s | tee pyregfi3-install.log" % destdir)
+               "python3 setup.py install --root=/%s | tee pyregfi3-install.log" % destdir)
 
 # API documentation