From: Bdale Garbee <bdale@gag.com>
Date: Wed, 12 Dec 2007 06:13:03 +0000 (-0700)
Subject: Imported Debian patch 1.5-16
X-Git-Tag: debian/1.5-16^0
X-Git-Url: https://git.gag.com/?p=debian%2Fpax;a=commitdiff_plain;h=cb6703ea016d508fda995d2933c036acc05cdc7e

Imported Debian patch 1.5-16
---

diff --git a/debian/changelog b/debian/changelog
index 01f455c..71abf20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pax (1:1.5-16) unstable; urgency=low
+
+  * patch for -s irregularities from Stephane Chazelas, closes: #451361
+  * clean up various lintian warnings
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 11 Dec 2007 23:13:03 -0700
+
 pax (1:1.5-15) unstable; urgency=low
 
   * update priority in control file to match override
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 0a5830b..3cc53b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.3
 
 Package: pax
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 9df2b74..7b91107 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp install-stamp
 
-	-$(MAKE) realclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 
 	dh_clean
 
@@ -27,7 +27,7 @@ install-stamp: build-stamp
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	$(MAKE) prefix=`pwd`/debian/pax/usr install
 
 	touch install-stamp
 
diff --git a/pat_rep.c b/pat_rep.c
index a93809f..03b9a81 100644
--- a/pat_rep.c
+++ b/pat_rep.c
@@ -85,7 +85,7 @@ static char * range_match __P((register char *, register int));
 #ifdef NET2_REGEX
 static int resub __P((regexp *, char *, char *, register char *));
 #else
-static int resub __P((regex_t *, regmatch_t *, char *, char *, char *));
+static int resub __P((regex_t *, regmatch_t *, char *, char *, char *, char *));
 #endif
 
 /*
@@ -1020,7 +1020,7 @@ rep_name(name, nlen, prnt)
 #			ifdef NET2_REGEX
 			if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) {
 #			else
-			if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt))
+			if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt))
 			    < 0) {
 #			endif
 				if (prnt)
@@ -1172,7 +1172,7 @@ resub(prog, src, dest, destend)
 
 #ifdef __STDC__
 static int
-resub(regex_t *rp, register regmatch_t *pm, char *src, char *dest,
+resub(regex_t *rp, register regmatch_t *pm, char *orig, char *src, char *dest,
 	register char *destend)
 #else
 static int
@@ -1231,7 +1231,7 @@ resub(rp, pm, src, dest, destend)
 		 */
 		if (len > (destend - dpt))
 			len = destend - dpt;
-		if (l_strncpy(dpt, src + pmpt->rm_so, len) != len)
+		if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len)
 			return(-1);
 		dpt += len;
 	}
diff --git a/types.h b/types.h
index baf4d8d..a38bb39 100644
--- a/types.h
+++ b/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
- * $Id: types.h,v 1.1 2001/07/23 05:20:01 bdale Exp $
+ * $Id: types.h,v 1.1 2001-07-23 05:20:01 bdale Exp $
  */
 
 #ifndef _SYS_TYPES_H_