Remove autoreconf files, remove dh-autoreconf from control file, split makefile patch so functions become more clear:

2015-09-07 21:15:26 +01:00 · 2015-09-07 21:15:26 +01:00 · de9be78d2e
parent 66e6edde31
commit de9be78d2e
8 changed files with 41 additions and 210 deletions
--- a/debian/autoreconf.after
+++ b/debian/autoreconf.after
@ -1,90 +0,0 @@
-c167a5c4b286409f0a0ef06807dfbeb4  ./INSTALL
-c9c523e67c5cbba3255b8f654e2501d1  ./node.h
-05d7236c7a54853ac8915c575bb63350  ./.pc/applied-patches
-906e9469b14a21201a3e54562f453866  ./.pc/configure/configure
-4c888d0ea1ddc14f0f5db7cc8dcfd729  ./.pc/configure/Makefile.include.in
-48dbc350782112b9ccd1bfd8e52273af  ./.pc/configure/config.h.in
-bbe7ff0b3ab66bbdc08a3dc538d8dc37  ./.pc/configure/Makefile.in
-26ab0db90d72e28ad0ba1e22ee510510  ./.pc/.version
-e8a673d5d4d69a5fd11c880fd4c3c481  ./.pc/.quilt_series
-d41d8cd98f00b204e9800998ecf8427e  ./.pc/.dpkg-source-unapply
-266f9759f56277b2751b24d1eb17c50f  ./.pc/.quilt_patches
-fbf795e288406ffb2f26d5692894cf26  ./cmdparse.c
-5b2cf7354cf61a7244e8d3fa7add8f49  ./configure
-7cb486c5f605b6755c6595d3ac3c232f  ./sysinfo.c
-5e8130f7a0fbcbbfe696262a71247c63  ./nodeusers.c
-7abc81c4ae5a60f09329d408390d10ce  ./man/uronode.8.gz
-cfa938ce3028ed5e716bb4665f2c05b2  ./man/flexd.conf.5.gz
-11d54327d3d03d78ad6f2ec1e6712168  ./man/nodeusers.1.gz
-ef6949a9111aa1e0cf7185db60ec3bf7  ./man/axdigi.8.gz
-1e0785f09bae9c6ab6070afd19f48767  ./man/uronode.conf.5.gz
-cf6cfd5b436f30950df0646b4d9ae0d6  ./man/uronode.perms.5.gz
-1ad5a1b632e67e0b76d4bde2c01417af  ./COLORS
-e4b6af45fd3b71e971b87480feff5bca  ./axcalluser.c
-61045b6eb0eb5ace1f50f19b24e95cbd  ./user.c
-11c30bc58c628e494967d53180d7bc8c  ./flexd.c
-3712d6fe725ac2aa6e6dfa173effb3d2  ./Makefile.include.in
-2db1b1197bd81241fae6fd64016932b4  ./mheard.c
-8ca43cbc842c2336e835926c2166c28b  ./COPYING
-0eeceb90be3316cb97e60bdd67487849  ./CHANGES.2
-bf640b13ed90320c6e18abb806edb775  ./CHANGES.1
-01dec8d0748b19bace175e9758f7f2b8  ./config.c
-0b98b067690b17fa12300d2f1c614e0d  ./axcalluser.h
-8539e5e3a3babc0d0150d6332a1ea384  ./procinfo.h
-b04e1ab6767b291d0029d69141cb403a  ./system.c
-0d5814b9b82a1a99d1ae61f8aa255848  ./BBS.txt
-7a290058f08ceb58e06b272d847b4152  ./URONode.his
-5e33ad5b76816f43eaf901738c23e676  ./gateway.c
-8a08d6b0efebca2c0408a45f3399f57a  ./config.h.in
-04ab788e872f70cf319e990d2aed8c1a  ./procinfo.c
-8f17c04d7549afe1395e71cb63ceb80d  ./Makefile.in
-13365c873ebc8a5e8a9d3e1b896918b9  ./node.c
-102b251ccdef291c0aee3b550d741195  ./util.c
-b24f939f14579b21003bee1b1c2dc58d  ./extcmd.c
-e1131c674ed69ba474d7664979e6637c  ./ipc.c
-5ee227e993d0e109e8ef47b0f3c15e7c  ./command.c
-14fa9209a91d7f655955b3b26aaf11db  ./sysinfo.h
-36d4b861bc23c2f9b996a34fad0220b0  ./README
-2c6183476e5fe823bc58ddfd662388b3  ./FAQ
-8b8b68a05ca70c176d2f5802c0cad4bb  ./etc/uronode.users
-08f87966ff2570b63602305c5776701d  ./etc/flexd.conf
-d41d8cd98f00b204e9800998ecf8427e  ./etc/lastlog
-5e0b2d259ee597aec5fe2e737a5eabb2  ./etc/uronode.motd
-ff05f76029e4dd2cdf5e44d89043bab5  ./etc/uronode.conf
-4bdb2ee78391a1bc9b56235e6c861bf6  ./etc/uronode.perms
-1d6879336930b63caa2eadee4b8c6096  ./etc/help/routes.hlp
-2695c8a5516fcbf048fd84d7ce211778  ./etc/help/ports.hlp
-30421e79c99d2051cf0de0061497dfde  ./etc/help/nodes.hlp
-e80d7894e46f9dcdba31f5ad0f9f3256  ./etc/help/color.hlp
-820244d154ba84da318aa8ef67c6f566  ./etc/help/info.hlp
-4c3a107dd069cd14530f2431daf13b48  ./etc/help/rose.hlp
-f8843700b34f0c49cf26911f2a1967da  ./etc/help/sessions.hlp
-07e1db762d4c4856d0f8af6d399e54ae  ./etc/help/msg.hlp
-bf23c2bd50e809cc8236d3442745f5a3  ./etc/help/mheard.hlp
-b3459b040424f8278dec4a1952649c00  ./etc/help/host.hlp
-9aae945adb51b0c0d4a58f17ed3fbb7b  ./etc/help/telnet.hlp
-5eb2ab60b27ffa243223f23fea76ff3a  ./etc/help/netstat.hlp
-093d4d8502d386dcc4578b590aa0a382  ./etc/help/links.hlp
-1089a26a0aa223c1a58db22515a45df0  ./etc/help/bye.hlp
-34568d387aa6316876aea14d24013bbd  ./etc/help/ztelnet.hlp
-0f38bc2463cf3a1d08ede70d0f59a9a5  ./etc/help/status.hlp
-7c67df1ac9ac3f05e38d82e365cdf663  ./etc/help/zconnect.hlp
-5938a39c9a7154501399b005282d23e2  ./etc/help/connect.hlp
-221ad533333658129d8c3d665b955087  ./etc/help/escape.hlp
-a2e83a1f17de4e203b265da5b0438618  ./etc/help/quit.hlp
-14deda2ae6620f6f0ee4d338141fa29c  ./etc/help/mail.hlp
-9a23afdd8b42702374c8c34fb7aae06a  ./etc/help/who.hlp
-1747fd6082e3f91f99d7378170ec59c8  ./etc/help/version.hlp
-87083a6e38e46bdad4526a8d2ce54cd3  ./etc/help/help.hlp
-bb905667e850116d0e7af9489a17984e  ./etc/help/desti.hlp
-259bd37d2db9cd6e7da3084114d837d6  ./etc/help/message.hlp
-43431147b700d97ecb63f183ceefc03d  ./etc/help/users.hlp
-a78541e47bbfbedd2cdea108e7567e53  ./etc/help/finger.hlp
-8e58bb9f42b536844ada26c7e1aec880  ./etc/help/ping.hlp
-bae7d97cf43953d722072702d79d25cd  ./etc/uronode.routes
-9596e455713b84da9e3caec3e1b94d77  ./etc/axdigi.conf
-d41d8cd98f00b204e9800998ecf8427e  ./etc/loggedin
-5f2802d92497d89d1de331755b59519e  ./etc/uronode.info
-d41d8cd98f00b204e9800998ecf8427e  ./etc/gateways
-0abba3f0b583b4e054f25ec7f9163b17  ./axdigi.c
-90c29e6d2a01132badf42b68592571d8  ./router.c
--- a/debian/autoreconf.before
+++ b/debian/autoreconf.before
@ -1,90 +0,0 @@
-c167a5c4b286409f0a0ef06807dfbeb4  ./INSTALL
-c9c523e67c5cbba3255b8f654e2501d1  ./node.h
-05d7236c7a54853ac8915c575bb63350  ./.pc/applied-patches
-906e9469b14a21201a3e54562f453866  ./.pc/configure/configure
-4c888d0ea1ddc14f0f5db7cc8dcfd729  ./.pc/configure/Makefile.include.in
-48dbc350782112b9ccd1bfd8e52273af  ./.pc/configure/config.h.in
-bbe7ff0b3ab66bbdc08a3dc538d8dc37  ./.pc/configure/Makefile.in
-26ab0db90d72e28ad0ba1e22ee510510  ./.pc/.version
-e8a673d5d4d69a5fd11c880fd4c3c481  ./.pc/.quilt_series
-d41d8cd98f00b204e9800998ecf8427e  ./.pc/.dpkg-source-unapply
-266f9759f56277b2751b24d1eb17c50f  ./.pc/.quilt_patches
-fbf795e288406ffb2f26d5692894cf26  ./cmdparse.c
-5b2cf7354cf61a7244e8d3fa7add8f49  ./configure
-7cb486c5f605b6755c6595d3ac3c232f  ./sysinfo.c
-5e8130f7a0fbcbbfe696262a71247c63  ./nodeusers.c
-7abc81c4ae5a60f09329d408390d10ce  ./man/uronode.8.gz
-cfa938ce3028ed5e716bb4665f2c05b2  ./man/flexd.conf.5.gz
-11d54327d3d03d78ad6f2ec1e6712168  ./man/nodeusers.1.gz
-ef6949a9111aa1e0cf7185db60ec3bf7  ./man/axdigi.8.gz
-1e0785f09bae9c6ab6070afd19f48767  ./man/uronode.conf.5.gz
-cf6cfd5b436f30950df0646b4d9ae0d6  ./man/uronode.perms.5.gz
-1ad5a1b632e67e0b76d4bde2c01417af  ./COLORS
-e4b6af45fd3b71e971b87480feff5bca  ./axcalluser.c
-61045b6eb0eb5ace1f50f19b24e95cbd  ./user.c
-11c30bc58c628e494967d53180d7bc8c  ./flexd.c
-3712d6fe725ac2aa6e6dfa173effb3d2  ./Makefile.include.in
-2db1b1197bd81241fae6fd64016932b4  ./mheard.c
-8ca43cbc842c2336e835926c2166c28b  ./COPYING
-0eeceb90be3316cb97e60bdd67487849  ./CHANGES.2
-bf640b13ed90320c6e18abb806edb775  ./CHANGES.1
-01dec8d0748b19bace175e9758f7f2b8  ./config.c
-0b98b067690b17fa12300d2f1c614e0d  ./axcalluser.h
-8539e5e3a3babc0d0150d6332a1ea384  ./procinfo.h
-b04e1ab6767b291d0029d69141cb403a  ./system.c
-0d5814b9b82a1a99d1ae61f8aa255848  ./BBS.txt
-7a290058f08ceb58e06b272d847b4152  ./URONode.his
-5e33ad5b76816f43eaf901738c23e676  ./gateway.c
-8a08d6b0efebca2c0408a45f3399f57a  ./config.h.in
-04ab788e872f70cf319e990d2aed8c1a  ./procinfo.c
-8f17c04d7549afe1395e71cb63ceb80d  ./Makefile.in
-13365c873ebc8a5e8a9d3e1b896918b9  ./node.c
-102b251ccdef291c0aee3b550d741195  ./util.c
-b24f939f14579b21003bee1b1c2dc58d  ./extcmd.c
-e1131c674ed69ba474d7664979e6637c  ./ipc.c
-5ee227e993d0e109e8ef47b0f3c15e7c  ./command.c
-14fa9209a91d7f655955b3b26aaf11db  ./sysinfo.h
-36d4b861bc23c2f9b996a34fad0220b0  ./README
-2c6183476e5fe823bc58ddfd662388b3  ./FAQ
-8b8b68a05ca70c176d2f5802c0cad4bb  ./etc/uronode.users
-08f87966ff2570b63602305c5776701d  ./etc/flexd.conf
-d41d8cd98f00b204e9800998ecf8427e  ./etc/lastlog
-5e0b2d259ee597aec5fe2e737a5eabb2  ./etc/uronode.motd
-ff05f76029e4dd2cdf5e44d89043bab5  ./etc/uronode.conf
-4bdb2ee78391a1bc9b56235e6c861bf6  ./etc/uronode.perms
-1d6879336930b63caa2eadee4b8c6096  ./etc/help/routes.hlp
-2695c8a5516fcbf048fd84d7ce211778  ./etc/help/ports.hlp
-30421e79c99d2051cf0de0061497dfde  ./etc/help/nodes.hlp
-e80d7894e46f9dcdba31f5ad0f9f3256  ./etc/help/color.hlp
-820244d154ba84da318aa8ef67c6f566  ./etc/help/info.hlp
-4c3a107dd069cd14530f2431daf13b48  ./etc/help/rose.hlp
-f8843700b34f0c49cf26911f2a1967da  ./etc/help/sessions.hlp
-07e1db762d4c4856d0f8af6d399e54ae  ./etc/help/msg.hlp
-bf23c2bd50e809cc8236d3442745f5a3  ./etc/help/mheard.hlp
-b3459b040424f8278dec4a1952649c00  ./etc/help/host.hlp
-9aae945adb51b0c0d4a58f17ed3fbb7b  ./etc/help/telnet.hlp
-5eb2ab60b27ffa243223f23fea76ff3a  ./etc/help/netstat.hlp
-093d4d8502d386dcc4578b590aa0a382  ./etc/help/links.hlp
-1089a26a0aa223c1a58db22515a45df0  ./etc/help/bye.hlp
-34568d387aa6316876aea14d24013bbd  ./etc/help/ztelnet.hlp
-0f38bc2463cf3a1d08ede70d0f59a9a5  ./etc/help/status.hlp
-7c67df1ac9ac3f05e38d82e365cdf663  ./etc/help/zconnect.hlp
-5938a39c9a7154501399b005282d23e2  ./etc/help/connect.hlp
-221ad533333658129d8c3d665b955087  ./etc/help/escape.hlp
-a2e83a1f17de4e203b265da5b0438618  ./etc/help/quit.hlp
-14deda2ae6620f6f0ee4d338141fa29c  ./etc/help/mail.hlp
-9a23afdd8b42702374c8c34fb7aae06a  ./etc/help/who.hlp
-1747fd6082e3f91f99d7378170ec59c8  ./etc/help/version.hlp
-87083a6e38e46bdad4526a8d2ce54cd3  ./etc/help/help.hlp
-bb905667e850116d0e7af9489a17984e  ./etc/help/desti.hlp
-259bd37d2db9cd6e7da3084114d837d6  ./etc/help/message.hlp
-43431147b700d97ecb63f183ceefc03d  ./etc/help/users.hlp
-a78541e47bbfbedd2cdea108e7567e53  ./etc/help/finger.hlp
-8e58bb9f42b536844ada26c7e1aec880  ./etc/help/ping.hlp
-bae7d97cf43953d722072702d79d25cd  ./etc/uronode.routes
-9596e455713b84da9e3caec3e1b94d77  ./etc/axdigi.conf
-d41d8cd98f00b204e9800998ecf8427e  ./etc/loggedin
-5f2802d92497d89d1de331755b59519e  ./etc/uronode.info
-d41d8cd98f00b204e9800998ecf8427e  ./etc/gateways
-0abba3f0b583b4e054f25ec7f9163b17  ./axdigi.c
-90c29e6d2a01132badf42b68592571d8  ./router.c
--- a/debian/control
+++ b/debian/control
@ -3,7 +3,7 @@ Section: hamradio
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
 Uploaders: Dave Hibberd <d@vehibberd.com>
-Build-Depends: debhelper (>= 9), libax25-dev, zlib1g-dev, dh-autoreconf
+Build-Depends: debhelper (>= 9), libax25-dev, zlib1g-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/uronode.git
 Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/uronode.git
--- a/debian/patches/folder-update
+++ b/debian/patches/folder-update
@ -1,7 +1,7 @@
-Description: Update the folders this is installed to
+Description: Update the folders in which Uronode is installed
 Author: Dave Hibberd <d@vehibberd.com>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Last-Update: 2015-09-07
+
 --- a/configure
 +++ b/configure
@@ -1,5 +1,5 @@
--- a/debian/patches/install-dir-creation
+++ b/debian/patches/install-dir-creation
@ -0,0 +1,14 @@
+Description: Create proper SBIN_DIR directory at install time
+Author: Dave Hibberd <d@vehibberd.com>
+Last-Update: 2015-09-07
+
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -33,6 +33,7 @@
+ 	install -m 644    -p etc/gateways	 $(VAR_DIR)/flex
+ 	
+ installbin: all
+	install -m 755	  -D -d $(SBIN_DIR)
+ 	install -m 755 	-s -p	uronode		$(SBIN_DIR)
+ 	install -m 755  -s -p	nodeusers	$(SBIN_DIR)
+ 	install -m 755  -s -p	axdigi		$(SBIN_DIR)
--- a/debian/patches/no-install-gz-manpages
+++ b/debian/patches/no-install-gz-manpages
@ -1,23 +1,9 @@
-Description: Remove CFLAG and LDFlags for hardening, remove installman 
-to stop installation of gzipped manpages, added directory install for
-SBIN_DIR
+Description: Prevent installation of gzipped manpages, they have been moved to the debian folder and unzipped
 Author: Dave Hibberd <d@vehibberd.com>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Last-Update: 2015-09-07

 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -3,8 +3,8 @@
- CC = gcc
- LD = gcc
- # CFLAGS = -O2 -g -s -Wstrict-prototypes
-CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
-LDFLAGS =
-+#CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
-+#LDFLAGS =
- LIBS = -lax25 -lax25io
- 
- include Makefile.include
@@ -24,7 +24,7 @@
 .c.o:
 	$(CC) $(CFLAGS) -c $<
@ -27,15 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 	install -m 755    -D -d	$(VAR_DIR)
 	install -m 755    -D -d	$(VAR_DIR)/node
 	install -m 644    -p etc/loggedin	$(VAR_DIR)/node
-@@ -33,6 +33,7 @@
- 	install -m 644    -p etc/gateways	 $(VAR_DIR)/flex
- 	
- installbin: all
-+	install -m 755    -D -d $(SBIN_DIR)
- 	install -m 755 	-s -p	uronode		$(SBIN_DIR)
- 	install -m 755  -s -p	nodeusers	$(SBIN_DIR)
- 	install -m 755  -s -p	axdigi		$(SBIN_DIR)
-@@ -53,16 +54,7 @@
+@@ -53,16 +53,7 @@
 	install -m 600    -p etc/uronode.routes   $(ETC_DIR)
 	install -m 600    -p etc/flexd.conf  $(ETC_DIR)
 
--- a/debian/patches/remove-cflags
+++ b/debian/patches/remove-cflags
@ -0,0 +1,17 @@
+Description: Remove CFLAGS and LDFLAGS to fix Lintian hardening errors
+Author: Dave Hibberd <d@vehibberd.com>
+Last-Update: 2015-09-07
+
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -3,8 +3,8 @@
+ CC = gcc
+ LD = gcc
+ # CFLAGS = -O2 -g -s -Wstrict-prototypes
+-CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
+-LDFLAGS =
+#CFLAGS = -O2 -g -Wno-unused-result -Wstrict-prototypes
+#LDFLAGS =
+ LIBS = -lax25 -lax25io
+ 
+ include Makefile.include
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,2 +1,4 @@
+remove-cflags
 folder-update
-makefile
+no-install-gz-manpages
+install-dir-creation