ITS: scrotwm (already in Debian)
On 2011-11-10 11:51, Andrea Bolognani wrote:
> Dear mentors,
>
> [...]
>
> The package is already in Debian; however, the packaged version is really
> old (almost two years) and my usual sponsor is no longer able to review
> and upload it further due to time constraints.
>
> I would be glad if someone would review and upload this package for me,
> and I would prefer it if the sponsor was interested in acting as a
> recurring sponsor for this and other packages I maintain in Debian.
>
> Have a nice day.
>
Hi,
As the subject suggests I am willing to sponsor the package. :) But
before I do; have you considered enabling hardning flags in your
package? A basic example of how to do it can be seen the attached patch[1].
Is there a reason that the binaries are compiled without
optimization[2]? As far as I can tell it is an oversight, because the
"osx" Makefile includes an "-O2" flag. However, if it is known to have
issues with optimization on Linux platforms, a comment about that would
be appreciated (bonus points for valid references to bugs against gcc :P).
~Niels
[1] Strictly speaking the CFLAGS/LDFLAGS from should "overrule" the
upstream ones if there are conflicts. Fixing that is left as an
exercise to the reader. ;)
[2] If so, my patch will need a "DEB_CFLAGS_MAINT_STRIP:=-O2" before the
include.
diff -Nru scrotwm-0.9.34/debian/changelog scrotwm-0.9.34/debian/changelog
--- scrotwm-0.9.34/debian/changelog 2011-11-09 18:04:29.000000000 +0100
+++ scrotwm-0.9.34/debian/changelog 2011-11-10 12:37:38.000000000 +0100
@@ -1,3 +1,10 @@
+scrotwm (0.9.34-1.1) UNRELEASED; urgency=low
+
+ * Use buildflags.mk from dpkg-dev to set default buildflags.
+ - Enables hardning flags.
+
+ -- Niels Thykier <niels@thykier.net> Thu, 10 Nov 2011 12:40:00 +0200
+
scrotwm (0.9.34-1) unstable; urgency=low
* New upstream release.
diff -Nru scrotwm-0.9.34/debian/control scrotwm-0.9.34/debian/control
--- scrotwm-0.9.34/debian/control 2011-11-09 18:04:29.000000000 +0100
+++ scrotwm-0.9.34/debian/control 2011-11-10 12:38:15.000000000 +0100
@@ -2,7 +2,8 @@
Section: x11
Priority: optional
Maintainer: Andrea Bolognani <eof@kiyuko.org>
-Build-Depends: debhelper (>= 7), libx11-dev, libxt-dev, libxrandr-dev, libxtst-dev
+Build-Depends: debhelper (>= 7), libx11-dev, libxt-dev, libxrandr-dev, libxtst-dev,
+ dpkg-dev (>= 1.16.1~)
Standards-Version: 3.9.2
Homepage: http://opensource.conformal.com/wiki/Scrotwm
Vcs-Git: git://git.debian.org/collab-maint/scrotwm.git
diff -Nru scrotwm-0.9.34/debian/patches/debian-changes-0.9.34-1.1 scrotwm-0.9.34/debian/patches/debian-changes-0.9.34-1.1
--- scrotwm-0.9.34/debian/patches/debian-changes-0.9.34-1.1 1970-01-01 01:00:00.000000000 +0100
+++ scrotwm-0.9.34/debian/patches/debian-changes-0.9.34-1.1 2011-11-10 12:41:50.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Pass $(LDFLAGS) to gcc when making shared libraries.
+
+--- scrotwm-0.9.34.orig/linux/Makefile
++++ scrotwm-0.9.34/linux/Makefile
+@@ -25,10 +25,10 @@ scrotwm: scrotwm.o linux.o
+ $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
+
+ %.so: %.c
+- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
++ $(CC) $(LDFLAGS) $(CFLAGS) -c -fpic -DPIC $+ -o $@
+
+ libswmhack.so.$(LVERS): swm_hack.so
+- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
++ $(CC) -shared $(LDFLAGS) -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
+
+ install: all
+ install -m 755 -d $(DESTDIR)$(BINDIR)
diff -Nru scrotwm-0.9.34/debian/patches/series scrotwm-0.9.34/debian/patches/series
--- scrotwm-0.9.34/debian/patches/series 2011-11-09 18:04:29.000000000 +0100
+++ scrotwm-0.9.34/debian/patches/series 2011-11-10 12:41:04.000000000 +0100
@@ -4,3 +4,4 @@
101-use-x-terminal-emulator-instead-of-xterm.diff
102-remove-openbsd-assumptions.diff
103-try-versioned-dlopen.diff
+debian-changes-0.9.34-1.1
diff -Nru scrotwm-0.9.34/debian/rules scrotwm-0.9.34/debian/rules
--- scrotwm-0.9.34/debian/rules 2011-11-09 18:04:29.000000000 +0100
+++ scrotwm-0.9.34/debian/rules 2011-11-10 12:38:01.000000000 +0100
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+DPKG_EXPORT_BUILDFLAGS=1
+include /usr/share/dpkg/buildflags.mk
+
DESTDIR=$(CURDIR)/debian/scrotwm
build: build-indep build-arch
Reply to: