control: tags -1 +patch
Hi,
I've fixed this FTBFS (and added more improvement, in my point of view ;)
as attached patch. Please check and consider to apply (some part of) it.
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
diff -Nru libapache2-mod-log-slow-1.0.8/debian/changelog libapache2-mod-log-slow-1.0.8/debian/changelog
--- libapache2-mod-log-slow-1.0.8/debian/changelog 2014-04-22 02:06:34.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/changelog 2014-04-22 02:01:22.000000000 +0900
@@ -1,3 +1,22 @@
+libapache2-mod-log-slow (1.0.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * use source format 3.0 (quilt)
+ * debian/patches
+ - add adjust.patch to ignore hardcoded path (Closes: #725606)
+ - add add-install-target.patch to add missing install target in upstream
+ Makefile (I wonder why previous version would work)
+ * debian/compat
+ - set 9 to enable hardening in rules
+ * debian/control
+ - set "Build-Depends: debhelper (>= 9)" as above
+ * add debian/{install,dirs}
+ * debian/rules
+ - set hardening option
+ - simplify it
+
+ -- Hideki Yamane <[email protected]> Tue, 22 Apr 2014 00:40:10 +0900
+
libapache2-mod-log-slow (1.0.8-1) unstable; urgency=low
* New upstream release (closes: #707062).
diff -Nru libapache2-mod-log-slow-1.0.8/debian/compat libapache2-mod-log-slow-1.0.8/debian/compat
--- libapache2-mod-log-slow-1.0.8/debian/compat 2014-04-22 02:06:34.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/compat 2014-04-22 01:46:51.000000000 +0900
@@ -1 +1 @@
-5
+9
diff -Nru libapache2-mod-log-slow-1.0.8/debian/control libapache2-mod-log-slow-1.0.8/debian/control
--- libapache2-mod-log-slow-1.0.8/debian/control 2014-04-22 02:06:34.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/control 2014-04-22 01:46:45.000000000 +0900
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Cyril Bouthors <[email protected]>
Uploaders: Cyril Bouthors <[email protected]>
-Build-Depends: debhelper (>= 7.0.50), apache2-dev
+Build-Depends: debhelper (>= 9), apache2-dev
Standards-Version: 3.9.4
Package: libapache2-mod-log-slow
diff -Nru libapache2-mod-log-slow-1.0.8/debian/dirs libapache2-mod-log-slow-1.0.8/debian/dirs
--- libapache2-mod-log-slow-1.0.8/debian/dirs 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/dirs 2014-04-22 01:48:32.000000000 +0900
@@ -0,0 +1 @@
+etc/apache2/mods-available
diff -Nru libapache2-mod-log-slow-1.0.8/debian/install libapache2-mod-log-slow-1.0.8/debian/install
--- libapache2-mod-log-slow-1.0.8/debian/install 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/install 2014-04-22 01:49:23.000000000 +0900
@@ -0,0 +1 @@
+debian/log_slow.* etc/apache2/mods-available/
diff -Nru libapache2-mod-log-slow-1.0.8/debian/patches/add-install-target.patch libapache2-mod-log-slow-1.0.8/debian/patches/add-install-target.patch
--- libapache2-mod-log-slow-1.0.8/debian/patches/add-install-target.patch 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/patches/add-install-target.patch 2014-04-22 02:02:22.000000000 +0900
@@ -0,0 +1,30 @@
+Description: set install target
+
+ taken from upstream Makefile13 and adjust it
+
+Author: Hideki Yamane <[email protected]>
+Forwarded: no
+Last-Update: 2014-04-22
+
+Index: libapache2-mod-log-slow-1.0.8/Makefile
+===================================================================
+--- libapache2-mod-log-slow-1.0.8.orig/Makefile 2014-04-22 01:35:57.697022116 +0900
++++ libapache2-mod-log-slow-1.0.8/Makefile 2014-04-22 01:35:57.789022114 +0900
+@@ -13,10 +13,15 @@
+ APACHECTL=$(ap_basedir)/bin/apachectl
+
+ # the default target
+-all: local-shared-build
++all: mod_log_slow.so
++
++# compile the DSO file
++mod_log_slow.so: mod_log_slow.c
++ $(APXS) -c $(DEF) $(INC) $(LIB) mod_log_slow.c -o mod_log_slow.so
+
+ # install the shared object file into Apache
+-install: install-modules-yes
++install: all
++ $(APXS) -i -a -n 'log_slow' mod_log_slow.so
+
+ # cleanup
+ clean:
diff -Nru libapache2-mod-log-slow-1.0.8/debian/patches/adjust.patch libapache2-mod-log-slow-1.0.8/debian/patches/adjust.patch
--- libapache2-mod-log-slow-1.0.8/debian/patches/adjust.patch 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/patches/adjust.patch 2014-04-22 02:00:41.000000000 +0900
@@ -0,0 +1,18 @@
+Description: do not use hardcoded ap_basedir
+Author: Hideki Yamane <[email protected]>
+Bug-Debian: http://bugs.debian.org/725606
+Forwarded: no
+Last-Update: 2014-04-22
+
+Index: libapache2-mod-log-slow-1.0.8/Makefile
+===================================================================
+--- libapache2-mod-log-slow-1.0.8.orig/Makefile 2014-04-22 01:07:54.337046196 +0900
++++ libapache2-mod-log-slow-1.0.8/Makefile 2014-04-22 01:23:47.033032628 +0900
+@@ -3,7 +3,6 @@
+ ## Autogenerated via ``apxs -n log_slow -g''.
+ ##
+
+-ap_basedir=/home/apache-2.2.2
+ builddir=.
+ top_srcdir=$(ap_basedir)
+ top_builddir=$(ap_basedir)
diff -Nru libapache2-mod-log-slow-1.0.8/debian/patches/series libapache2-mod-log-slow-1.0.8/debian/patches/series
--- libapache2-mod-log-slow-1.0.8/debian/patches/series 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/patches/series 2014-04-22 01:13:00.000000000 +0900
@@ -0,0 +1,2 @@
+adjust.patch
+add-install-target.patch
diff -Nru libapache2-mod-log-slow-1.0.8/debian/rules libapache2-mod-log-slow-1.0.8/debian/rules
--- libapache2-mod-log-slow-1.0.8/debian/rules 2014-04-22 02:06:34.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/rules 2014-04-22 01:49:30.000000000 +0900
@@ -1,18 +1,7 @@
#!/usr/bin/make -f
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+export ap_basedir=/usr/share/apache2
%:
dh $@
-
-override_dh_auto_build:
- $(MAKE) ap_basedir=/usr/share/apache2 CFLAGS="$(CFLAGS)"
-
-override_dh_auto_clean:
- $(MAKE) ap_basedir=/usr/share/apache2 clean
-
-override_dh_auto_install:
- $(MAKE) ap_basedir=/usr/share/apache2 DESTDIR=$(CURDIR)/debian/libapache2-mod-log-slow install
- mkdir -p debian/libapache2-mod-log-slow/etc/apache2/mods-available
- cp debian/log_slow.conf debian/libapache2-mod-log-slow/etc/apache2/mods-available
- cp debian/log_slow.load debian/libapache2-mod-log-slow/etc/apache2/mods-available
diff -Nru libapache2-mod-log-slow-1.0.8/debian/source/format libapache2-mod-log-slow-1.0.8/debian/source/format
--- libapache2-mod-log-slow-1.0.8/debian/source/format 1970-01-01 09:00:00.000000000 +0900
+++ libapache2-mod-log-slow-1.0.8/debian/source/format 2014-04-22 00:39:22.000000000 +0900
@@ -0,0 +1 @@
+3.0 (quilt)
