[Glibc-bsd-commits] r5500 - in trunk/freebsd-glue: debian src/freebsd-glue
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Mon Aug 25 19:46:32 UTC 2014
Author: stevenc-guest
Date: 2014-08-25 19:46:32 +0000 (Mon, 25 Aug 2014)
New Revision: 5500
Removed:
trunk/freebsd-glue/src/freebsd-glue/funopen.c
Modified:
trunk/freebsd-glue/debian/changelog
trunk/freebsd-glue/debian/control
trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
trunk/freebsd-glue/debian/rules
trunk/freebsd-glue/src/freebsd-glue/Makefile
Log:
* Switch to gcc-4.9 (Closes: #751309)
* Remove funopen, fwopen and fropen definitions, now provided by libbsd
(Closes: #759249)
Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/debian/changelog 2014-08-25 19:46:32 UTC (rev 5500)
@@ -1,3 +1,11 @@
+freebsd-glue (0.2.20) UNRELEASED; urgency=low
+
+ * Switch to gcc-4.9 (Closes: #751309)
+ * Remove funopen, fwopen and fropen definitions, now provided by libbsd
+ (Closes: #759249)
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org> Mon, 25 Aug 2014 20:40:41 +0100
+
freebsd-glue (0.2.19) unstable; urgency=low
* Add MAXHOSTNAMELEN fallback.
Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/debian/control 2014-08-25 19:46:32 UTC (rev 5500)
@@ -12,7 +12,7 @@
libdb-dev,
zlib1g-dev,
# For -Wno-error=maybe-uninitialized
- gcc-4.8,
+ gcc-4.9,
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-glue/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-glue/
Standards-Version: 3.9.3
@@ -23,7 +23,7 @@
libfreebsd-glue-0 (= ${binary:Version}),
original-awk,
make,
- libbsd-dev (>= 0.4.0-1~),
+ libbsd-dev (>= 0.7.0-1~),
libdb-dev,
zlib1g-dev,
libexpat-dev,
Modified: trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
===================================================================
--- trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols 2014-08-25 19:46:32 UTC (rev 5500)
@@ -42,9 +42,6 @@
(arch=kfreebsd-any)cpuset_setid at Base 0.1.15
execvP at Base 0.1.15
feature_present at Base 0.1.15
- fropen at Base 0.1.15
- funopen at Base 0.1.15
- fwopen at Base 0.1.15
(arch=kfreebsd-any)getbootfile at Base 0.1.15
getbsize at Base 0.2.17
(arch=kfreebsd-any)getdiskbyname at Base 0.1.15
Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/debian/rules 2014-08-25 19:46:32 UTC (rev 5500)
@@ -18,7 +18,7 @@
CFLAGS="$(CFLAGS) -O2" \
DESTDIR="$(DESTDIR)" \
bmake -m /usr/share/mk-freebsd \
- CC=gcc-4.8 \
+ CC=gcc-4.9 \
$(NULL)
PMAKE_UDEB := \
MAKEFLAGS=$(BSD_MAKEFLAGS) \
@@ -26,7 +26,7 @@
CFLAGS="$(CFLAGS) -Os" \
DESTDIR="$(DESTDIR)-udeb" \
bmake -m /usr/share/mk-freebsd \
- CC=gcc-4.8 \
+ CC=gcc-4.9 \
RESCUE=yes \
$(NULL)
Modified: trunk/freebsd-glue/src/freebsd-glue/Makefile
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/Makefile 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/src/freebsd-glue/Makefile 2014-08-25 19:46:32 UTC (rev 5500)
@@ -4,7 +4,6 @@
exec.c \
feature_present.c \
fstab.c \
- funopen.c \
getbsize.c \
getcap.c \
getosreldate.c \
Deleted: trunk/freebsd-glue/src/freebsd-glue/funopen.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/funopen.c 2014-08-24 23:02:55 UTC (rev 5499)
+++ trunk/freebsd-glue/src/freebsd-glue/funopen.c 2014-08-25 19:46:32 UTC (rev 5500)
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 2013 Robert Millan <rmh at debian.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-struct cookiebox
-{
- void *cookie;
- int (*readfn) (void *, char *, int);
- int (*writefn) (void *, const char *, int);
- int (*closefn) (void *);
-};
-
-static ssize_t
-cookiebox_read (void *cookie, char *buf, size_t size)
-{
- struct cookiebox *cookiebox = cookie;
- return cookiebox->readfn (cookiebox->cookie, buf, size);
-}
-
-static ssize_t
-cookiebox_write (void *cookie, const char *buf, size_t size)
-{
- struct cookiebox *cookiebox = cookie;
- return cookiebox->writefn (cookiebox->cookie, buf, size);
-}
-
-static int
-cookiebox_close (void *cookie)
-{
- struct cookiebox *cookiebox = cookie;
- int ret = cookiebox->closefn (cookiebox->cookie);
- free (cookiebox);
- return ret;
-}
-
-FILE *
-funopen (const void *cookie, int (*readfn)(void *, char *, int),
- int (*writefn)(void *, const char *, int),
- fpos_t (*seekfn)(void *, fpos_t, int), int (*closefn)(void *))
-{
- if (seekfn)
- {
- errno = ENOSYS;
- return NULL;
- }
-
- cookie_io_functions_t cookiebox_funcs = {
- .read = cookiebox_read,
- .write = cookiebox_write,
- .seek = NULL,
- .close = cookiebox_close
- };
-
- struct cookiebox *cookiebox = malloc (sizeof (*cookiebox));
-
- cookiebox->cookie = (void *) cookie;
- cookiebox->readfn = readfn;
- cookiebox->writefn = writefn;
- cookiebox->closefn = closefn;
-
- return fopencookie ((void *) cookiebox, "r+", cookiebox_funcs);
-}
-
-FILE *
-fropen (void *cookie, int (*readfn)(void *, char *, int))
-{
- return funopen (cookie, readfn, NULL, NULL, NULL);
-}
-
-FILE *
-fwopen (void *cookie, int (*writefn)(void *, const char *, int))
-{
- return funopen (cookie, NULL, writefn, NULL, NULL);
-}
More information about the Glibc-bsd-commits
mailing list