[Pkg-shadow-commits] r382 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-07-14 06:29:42 +0000 (Thu, 14 Jul 2005)
New Revision: 382

Added:
   trunk/debian/patches/444_no_strip_during_install
Removed:
   trunk/debian/patches/311_high-uids.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
   trunk/debian/rules
Log:
Build shadow with debugging.

I had to change the fix for #280212, and remove the fix from 311.
#280212 is now fixed in debian/rules

LDFLAGS is now more set in configure.in, so it can be untouched or
set to -s by dh_strip in debian/rules.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-12 15:17:05 UTC (rev 381)
+++ trunk/debian/changelog	2005-07-14 06:29:42 UTC (rev 382)
@@ -11,6 +11,7 @@
       is not reconfigured (ie also when not called from base-config). 
       Thanks to Bastian Blank for the patch and comments
       Closes: #316219
+    - Build shadow with debugging. Closes: #204644
   * Programs translation updates:
     - Hebrew translation disabled. Closes: #317805
   * Debconf translation updates:

Deleted: trunk/debian/patches/311_high-uids.dpatch
===================================================================
--- trunk/debian/patches/311_high-uids.dpatch	2005-07-12 15:17:05 UTC (rev 381)
+++ trunk/debian/patches/311_high-uids.dpatch	2005-07-14 06:29:42 UTC (rev 382)
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-## 011_high-uids.patch by Christian Perrier <bubulle@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include upstream changes for high UID support in faillog and lastlog
-## DP: Debian bug #280212
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
---- shadow-4.0.3.ori/configure.in	2005-01-10 08:26:18.000000000 +0100
-+++ shadow-4.0.3/configure.in	2005-01-10 08:42:08.000000000 +0100
-@@ -6,7 +6,7 @@
- dnl Some hacks...
- test "$prefix" = "NONE" && prefix="/usr"
- test "$prefix" = "/usr" && exec_prefix=""
--test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
-+test "$CFLAGS" = "" && CFLAGS="-O2 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
- test "$LDFLAGS" = "" && LDFLAGS="-s"
- 
- AM_DISABLE_SHARED

Added: trunk/debian/patches/444_no_strip_during_install
===================================================================
--- trunk/debian/patches/444_no_strip_during_install	2005-07-12 15:17:05 UTC (rev 381)
+++ trunk/debian/patches/444_no_strip_during_install	2005-07-14 06:29:42 UTC (rev 382)
@@ -0,0 +1,13 @@
+Index: shadow-4.0.3/configure.in
+===================================================================
+--- shadow-4.0.3.orig/configure.in	2005-07-12 20:59:29.000000000 +0300
++++ shadow-4.0.3/configure.in	2005-07-12 21:01:46.000000000 +0300
+@@ -7,7 +7,7 @@
+ test "$prefix" = "NONE" && prefix="/usr"
+ test "$prefix" = "/usr" && exec_prefix=""
+ test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+-test "$LDFLAGS" = "" && LDFLAGS="-s"
++dnl test "$LDFLAGS" = "" && LDFLAGS="-s"
+ 
+ AM_DISABLE_SHARED
+ AM_ENABLE_STATIC

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-07-12 15:17:05 UTC (rev 381)
+++ trunk/debian/patches/series	2005-07-14 06:29:42 UTC (rev 382)
@@ -88,7 +88,6 @@
 204_pt_BR-manpages.dpatch
 205_it-manpages.dpatch
 206_ko-manpages.dpatch
-311_high-uids.dpatch
 312_usermod-302388.dpatch
 313_pam_access_with_preauth.dpatch
 314_passwd.1_formatting.dpatch
@@ -132,3 +131,4 @@
 427_chage_expiry_0
 442_useradd.8-O
 443_chage_exit_values
+444_no_strip_during_install

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-07-12 15:17:05 UTC (rev 381)
+++ trunk/debian/rules	2005-07-14 06:29:42 UTC (rev 382)
@@ -1,5 +1,16 @@
 #!/usr/bin/make -f
 
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+ 
+CFLAGS = -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  CFLAGS += -O2
+endif
+export CFLAGS
+
 config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)