Package: prelink
Version: 0.0.20090311-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
Hello!
I would find it very useful to have the "execstack" utility available
without pulling in all of the prelink package's cruft. The attached patch
attempts to do this.
Also, prelink and execstack compile fine on other architectures, so the
P-a-s file should probably be updated too.
Thanks!
-Kees
--
Kees Cook @debian.org
diff -u prelink-0.0.20090311/debian/control prelink-0.0.20090311/debian/control
--- prelink-0.0.20090311/debian/control
+++ prelink-0.0.20090311/debian/control
@@ -11,7 +11,16 @@
-Architecture: alpha amd64 i386 lpia powerpc ppc64
-Depends: ${shlibs:Depends}
+Architecture: any
+Depends: ${shlibs:Depends}, execstack
Description: ELF prelinking utility to speed up dynamic linking
The prelink package contains a utility which modifies ELF shared libraries
and executables, so that far fewer relocations need to be resolved at
runtime and thus programs come up faster.
-
+
+Package: execstack
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: prelink (<< 0.0.20090311-2)
+Replaces: prelink
+Description: ELF GNU_STACK program header editing utility
+ The execstack package contains a utility which modifies (or adds) the
+ GNU_STACK program header to ELF binaries, and allows changing the executable
+ flag.
diff -u prelink-0.0.20090311/debian/rules prelink-0.0.20090311/debian/rules
--- prelink-0.0.20090311/debian/rules
+++ prelink-0.0.20090311/debian/rules
@@ -10,6 +10,7 @@
objdir := $(CURDIR)/obj
D := $(CURDIR)/debian/prelink
+E := $(CURDIR)/debian/execstack
configure: configure-stamp
configure-stamp:
@@ -57,6 +58,9 @@
chmod 0755 $D/usr/sbin/prelink
cp debian/prelink.conf $D/etc/
+ dh_installdirs -pexecstack usr/sbin/
+ mv $D/usr/sbin/execstack $E/usr/sbin/
+
binary-arch: build install
dh_testdir
dh_testroot
@@ -66,7 +70,8 @@
sed -e '1,/^%changelog$$/d' \
> $D/usr/share/doc/prelink/changelog
dh_installdocs TODO doc/prelink.pdf
- dh_installman doc/*.8 debian/prelink.bin.8
+ dh_installman doc/prelink.8 debian/prelink.bin.8
+ dh_installman -pexecstack doc/execstack.8
dh_installcron
cp debian/prelink.default $D/etc/default/prelink
dh_strip
diff -u prelink-0.0.20090311/debian/changelog prelink-0.0.20090311/debian/changelog
--- prelink-0.0.20090311/debian/changelog
+++ prelink-0.0.20090311/debian/changelog
@@ -1,3 +1,11 @@
+prelink (0.0.20090311-2) unstable; urgency=low
+
+ * debian/control: split execstack into a separate binary package to
+ avoid dragging the full prelink utility/cron stack into main.
+ * Flip architecture to "any" for armel builds, etc.
+
+ -- Kees Cook <[email protected]> Tue, 25 Aug 2009 13:53:25 -0700
+
prelink (0.0.20090311-1) unstable; urgency=low
* New upstream release
