prepare an upload jupp-3_1_18-3
authorThorsten Glaser <tg@mirbsd.org>
Sun, 25 Mar 2012 17:40:57 +0000 (17:40 +0000)
committerThorsten Glaser <tg@mirbsd.org>
Sun, 25 Mar 2012 17:40:57 +0000 (17:40 +0000)
debian/changelog
debian/control
debian/rules
debian/source.lintian-overrides [new file with mode: 0644]

index 2524ff3..2d1a2bd 100644 (file)
@@ -1,9 +1,13 @@
-jupp (3.1.18-3) xunstable; urgency=low
+jupp (3.1.18-3) unstable; urgency=low
 
   * Adjust joe-jupp Priority from optional to extra (debcheck)
-  * debian/rules: cleanup
+  * debian/rules: Clean up and modernise; enable +all hardening,
+    --as-needed, and some gmake magic to properly escape variables
+  * Quieten lintian
+  * Policy 3.9.3 (no relevant changes)
+  * debian/control: Use architecture wildcards for SELinux
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sat, 12 Nov 2011 00:06:08 +0000
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 25 Mar 2012 17:40:11 +0000
 
 jupp (3.1.18-2) unstable; urgency=low
 
index fead551..0a301b4 100644 (file)
@@ -1,4 +1,4 @@
-# $MirOS: jupp/debian/control,v 1.27 2011/10/06 09:31:41 tg Exp $
+# $MirOS: jupp/debian/control,v 1.28 2012/03/25 17:40:57 tg Exp $
 #
 Source: jupp
 Section: editors
@@ -7,11 +7,12 @@ Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Homepage: https://www.mirbsd.org/jupp.htm
 # dpkg-dev, autotools-dev, libselinux1-dev are optional build dependencies
 Build-Depends: debhelper (>= 7.0.0~),
- dpkg-dev (>= 1.16.1~),
- autotools-dev,
- libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libtinfo-dev | libncurses-dev
-Standards-Version: 3.9.2
+  dpkg-dev (>= 1.16.1~),
+  autotools-dev,
+# libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+  libselinux1-dev [linux-any],
+  libtinfo-dev | libncurses-dev
+Standards-Version: 3.9.3
 # First word is the $CVSROOT (-d arg) string, second word the module.
 Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/jupp
 Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/jupp/
@@ -44,7 +45,8 @@ Description: user friendly full screen text editor
  specified on the command line).  Joe also has a deferred screen update to
  handle typeahead, and it ensures that deferral is not bypassed by tty
  buffering.  It's usable even at 2400 baud, and it will work on any
- kind of sane terminal.  Furthermore, it supports SELinux context copying.
+ kind of sane terminal.  Furthermore, it supports SELinux context copying
+ on Debian systems with the Linux kernel.
  .
  This version of JOE only comes with the Jupp flavour, to not conflict
  with the Debian joe package, activated. The resource files and executable
@@ -62,5 +64,5 @@ Description: reimplement the joe Debian package using jupp
  This package contains symbolic links to replace the Debian joe package
  using the jupp package and implementation (both binaries and manpages).
  It also contains the appropriate conffiles and, in contrast to Debian's
- joe flavour, supports SELinux context copying (on !hurd !kfreebsd) and
- a number of bugs are fixed.
+ joe flavour, supports SELinux context copying (on Debian systems with
the Linux kernel) and a number of bugs are fixed.
index 5971536..f8910bd 100755 (executable)
@@ -1,21 +1,31 @@
 #!/usr/bin/make -f
-# $MirOS: jupp/debian/rules,v 1.17 2011/11/12 00:11:25 tg Exp $
+# $MirOS: jupp/debian/rules,v 1.18 2012/03/25 17:40:57 tg Exp $
+
+shellescape='$(subst ','\'',$(1))'
+shellexport=$(1)=$(call shellescape,${$(1)})
 
-SHELL?=                        sh
 CC?=                   gcc
+EXTRA_CFLAGS+=         -Wall -Wformat
+EXTRA_CFLAGS+=         -fno-omit-frame-pointer -fwrapv -fno-strict-aliasing
+# adjust when backporting
+EXTRA_CFLAGS+=         -Wextra -Wno-pointer-sign -Wno-unused-parameter \
+                       -Wno-missing-field-initializers \
+                       -Wno-old-style-definition -Wno-strict-prototypes \
+                       -Wno-cast-qual \
+                       -Wno-missing-prototypes -Wno-missing-declarations
+EXTRA_LDFLAGS=         -Wl,--as-needed
 
 ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
 # dpkg-dev (>= 1.16.1~)
+DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS}
+DEB_LDFLAGS_MAINT_APPEND=${EXTRA_LDFLAGS}
+DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/buildflags.mk
 else
 # old-fashioned way to determine build flags
-CFLAGS=                        -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS+=               -O0
-else
-CFLAGS+=               -O2
-endif
-# /dpkg-dev version prerequisite
+CFLAGS=                        -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g
+CFLAGS+=               ${EXTRA_CFLAGS}
+LDFLAGS+=              ${EXTRA_LDFLAGS}
 endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -23,15 +33,6 @@ NUMJOBS=             $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS+=            -j${NUMJOBS}
 endif
 
-CFLAGS+=               -Wall -Wformat
-CFLAGS+=               -fno-omit-frame-pointer -fwrapv -fno-strict-aliasing
-# adjust when backporting
-CFLAGS+=               -Wextra -Wno-pointer-sign -Wno-unused-parameter \
-                       -Wno-missing-field-initializers \
-                       -Wno-old-style-definition -Wno-strict-prototypes \
-                       -Wno-cast-qual \
-                       -Wno-missing-prototypes -Wno-missing-declarations
-
 debian/.configure_stamp:
        dh_testdir
        -rm -f debian/.*_stamp
@@ -44,10 +45,8 @@ debian/.configure_stamp:
        done
        mkdir builddir
        cd builddir && env \
-           CC='${CC}' \
-           CFLAGS='${CFLAGS}' \
-           CPPFLAGS='${CPPFLAGS}' \
-           ${SHELL} ../configure \
+           $(foreach i,CC CFLAGS CPPFLAGS LDFLAGS,$(call shellexport,$i)) \
+           sh ../configure \
            --sysconfdir=/etc \
            --prefix=/usr \
            --mandir=/usr/share/man \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..3094300
--- /dev/null
@@ -0,0 +1,5 @@
+# $MirOS: jupp/debian/source.lintian-overrides,v 1.1 2012/03/25 17:40:57 tg Exp $
+
+# desired method of keeping changes is CVS
+# as long as etch backports are required
+jupp source: direct-changes-in-diff-but-no-patch-system *