Changeset 549 for trunk/Makefile.in

Timestamp:

May 9, 2019, 10:43:55 PM (5 years ago)

Author:

katerina

Message:

Fix for ticket #440 (obsolete sstrip utility) and #441 (make deb broken).

File:

• trunk/Makefile.in (modified) (13 diffs)

trunk/Makefile.in

@@ -151 +151 @@
         $(srcsrc)/bignum.c $(srcsrc)/mkhdr.c \
         $(srcsrc)/samhain_setpwd.c $(srcsrc)/samhain_stealth.c \
-        $(srcsrc)/encode.c $(srcsrc)/sstrip.c \
+        $(srcsrc)/encode.c \
         $(srcsrc)/trustfile.c $(srcsrc)/exepack.c \
         $(srcsrc)/exepack_fill.c $(srcsrc)/exepack_mkdata.c \
@@ -232 +232 @@
 #----------------------------------------------------------
 
-all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL) sstrip
+all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL)
 
 
@@ -363 +363 @@
 
 CLEANFILES = encode config_xor.h depend-gen \
-        internal.h sh_MK.h trustfile sstrip samhain mkhdr encode cutest \
+        internal.h sh_MK.h trustfile samhain mkhdr encode cutest \
         yule samhain_setpwd samhain_stealth samhainrc yulectl
 
@@ -515 +515 @@
 
 
-install-program: $(PROGRAMS) sstrip
+install-program: $(PROGRAMS) 
         @$(mkinstalldirs) $(DESTDIR)$(sbindir)
         @if test x$(mytmpdir) != x; then \
@@ -528 +528 @@
               $(INSTALL_PROGRAM) $$p $$target; \
               chmod 0700 $$target; \
-              echo " ./sstrip $$target"; \
-              ./sstrip $$target; \
             else \
               echo " $(INSTALL_SHELL) $$p $$target"; \
@@ -840 +838 @@
         echo $(top_srcdir)/docs/README.gcc_bug           >> debian/docs; \
         echo $(top_srcdir)/docs/README.LZO               >> debian/docs; \
-        echo $(top_srcdir)/docs/README.sstrip            >> debian/docs; \
         echo $(top_srcdir)/docs/README.UPGRADE           >> debian/docs; \
         echo $(top_srcdir)/docs/README.win2K             >> debian/docs; \
@@ -860 +857 @@
         echo " -- $$maintainer  `date -R`" >> debian/changelog; \
         echo >> debian/changelog; \
-        echo "Local variables:" >> debian/changelog; \
-        echo "mode: debian-changelog" >> debian/changelog; \
-        echo "End:" >> debian/changelog; \
         cp   $(top_srcdir)/COPYING  debian/copyright; \
         echo "9" > debian/compat; \
@@ -890 +884 @@
         echo "Priority: optional" >> debian/control; \
         echo "Maintainer: $$maintainer" >> debian/control; \
-        echo "Standards-Version: 3.2.1" >> debian/control; \
+        echo "Build-Depends: debhelper (>> 9)" >> debian/control; \
+        echo "Standards-Version: 3.9.8" >> debian/control; \
         echo >> debian/control; \
         echo "Package: @install_name@" >> debian/control; \
@@ -1130 +1125 @@
 
 
-sstrip: $(srcsrc)/sstrip.c Makefile
-        $(BUILD_CC) -I.  -o sstrip $(srcsrc)/sstrip.c
-
 encode: $(srcsrc)/encode.c Makefile
         $(BUILD_CC) -I. -o encode $(srcsrc)/encode.c
@@ -1259 +1251 @@
 # prepare the data to be packed
 #
-exepack.data: $(SAMHAIN) exepack_mkdata sstrip
+exepack.data: $(SAMHAIN) exepack_mkdata 
         @echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
         cp ./$(SAMHAIN) ./samhain.pk.data; \
         echo "strip ./samhain.pk.data"; \
         strip ./samhain.pk.data > /dev/null 2>&1  || echo "... is already stripped"; \
-        echo "./sstrip ./samhain.pk.data"; \
-        ./sstrip ./samhain.pk.data > /dev/null 2>&1  || echo "sstrip returned false"; \
         echo "./exepack_mkdata ./samhain.pk.data ./exepack.data 0"; \
         ./exepack_mkdata ./samhain.pk.data ./exepack.data 0; \
@@ -1286 +1276 @@
         $(LINK) exepack_fill.o minilzo.o
 
-samhain.pk: $(SAMHAIN) exepack exepack_fill sstrip
+samhain.pk: $(SAMHAIN) exepack exepack_fill 
         @echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
         cp ./$(SAMHAIN) ./samhain.pk.data; \
         echo "strip ./samhain.pk.data"; \
         strip ./samhain.pk.data > /dev/null 2>&1  || echo "... is already stripped"; \
-        echo "./sstrip ./samhain.pk.data"; \
-        ./sstrip ./samhain.pk.data > /dev/null 2>&1  || echo "sstrip returned false"; \
         test -f exepack.out && rm exepack.out; \
         echo "./exepack_fill exepack samhain.pk.data exepack.out"; \
@@ -1299 +1287 @@
         echo "strip exepack.out"; \
         strip exepack.out > /dev/null 2>&1 || echo "... is already stripped"; \
-        ./sstrip exepack.out > /dev/null 2>&1 || echo "sstrip returned false"; \
         echo "mv exepack.out samhain.pk"; \
         rm -f samhain.pk; mv exepack.out samhain.pk
@@ -1673 +1660 @@
 samhain_stealth.o: $(srcsrc)/samhain_stealth.c Makefile config_xor.h 
 encode.o: $(srcsrc)/encode.c Makefile 
-sstrip.o: $(srcsrc)/sstrip.c Makefile config.h 
 trustfile.o: $(srcsrc)/trustfile.c Makefile config_xor.h $(srcinc)/sh_calls.h $(srcinc)/slib.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h 
 exepack.o: $(srcsrc)/exepack.c Makefile config.h $(srcinc)/minilzo.h $(srcinc)/exepack.data