[Glibc-bsd-commits] r5016 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-10-07 22:33:04 +0000 (Mon, 07 Oct 2013)
New Revision: 5016

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/031_savecore.diff
Log:
Simplify 031_savecore.diff by using zopen() from freebsd-glue.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-10-07 22:31:45 UTC (rev 5015)
+++ trunk/freebsd-utils/debian/changelog	2013-10-07 22:33:04 UTC (rev 5016)
@@ -1,3 +1,9 @@
+freebsd-utils (9.2-2) UNRELEASED; urgency=low
+
+  * Simplify 031_savecore.diff by using zopen() from freebsd-glue.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 08 Oct 2013 00:32:52 +0200
+
 freebsd-utils (9.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-10-07 22:31:45 UTC (rev 5015)
+++ trunk/freebsd-utils/debian/control	2013-10-07 22:33:04 UTC (rev 5016)
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 7), po-debconf, sharutils,
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.1.6~),
+ freebsd-glue (>= 0.1.9~),
  kfreebsd-kernel-headers (>= 9.1-3~),
  libc0.1-dev (>= 2.13-26),
  libbsd-dev (>= 0.3.0), pkg-config,

Modified: trunk/freebsd-utils/debian/patches/031_savecore.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/031_savecore.diff	2013-10-07 22:31:45 UTC (rev 5015)
+++ trunk/freebsd-utils/debian/patches/031_savecore.diff	2013-10-07 22:33:04 UTC (rev 5016)
@@ -1,60 +1,13 @@
----
- sbin/savecore/Makefile |    1 +
- sbin/savecore/zopen.c  |   42 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+)
-
 --- a/sbin/savecore/Makefile
 +++ b/sbin/savecore/Makefile
-@@ -1,6 +1,7 @@
+@@ -1,8 +1,9 @@
  # $FreeBSD$
  
  PROG=	savecore
-+SRCS=	savecore.c zopen.c
++SRCS=	savecore.c
  DPADD=	${LIBZ}
- LDADD=	-lz
+-LDADD=	-lz
++LDADD=	-lz -lfreebsd-glue
  MAN=	savecore.8
---- /dev/null
-+++ b/sbin/savecore/zopen.c
-@@ -0,0 +1,42 @@
-+/*
-+ * Public domain stdio wrapper for libz, written by Johan Danielsson.
-+ * Ported to GNU libc by Tuco Xyz.
-+ */
-+
-+#include <stdio.h>
-+#include <zlib.h>
-+
-+FILE *zopen(const char *fname, const char *mode);
-+
-+/* convert arguments */
-+static int
-+xgzread(void *cookie, char *data, int size)
-+{
-+    return gzread(cookie, data, size);
-+}
-+
-+static int
-+xgzwrite(void *cookie, const char *data, int size)
-+{
-+    return gzwrite(cookie, (void*)data, size);
-+}
-+
-+static cookie_io_functions_t xgzfunc = {
-+    .seek = NULL,
-+    .close = gzclose
-+};
-+
-+FILE *
-+zopen(const char *fname, const char *mode)
-+{
-+    gzFile gz = gzopen(fname, mode);
-+    if(gz == NULL)
-+	return NULL;
-+
-+    if(*mode == 'r')
-+	xgzfunc.read = xgzread;
-+    else
-+	xgzfunc.write = xgzwrite;
-+
-+    return fopencookie(gz, mode, xgzfunc);
-+}
+ 
+ .include <bsd.prog.mk>