[Glibc-bsd-commits] r3556 - trunk/web/patches
Robert Millan
rmh at alioth.debian.org
Sun Jul 10 12:44:04 UTC 2011
Author: rmh
Date: 2011-07-10 12:44:04 +0000 (Sun, 10 Jul 2011)
New Revision: 3556
Removed:
trunk/web/patches/discover.diff
trunk/web/patches/dmake.diff
trunk/web/patches/drift.diff
trunk/web/patches/erlang.diff
trunk/web/patches/fam.diff
trunk/web/patches/fcron.diff
trunk/web/patches/linux_soundcard.diff
Log:
Remove a few patches that have either been merged or obsoleted
Deleted: trunk/web/patches/discover.diff
===================================================================
--- trunk/web/patches/discover.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/discover.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,12 +0,0 @@
-diff -ur discover-2.0.7.old/sysdeps/stub/stubs.c discover-2.0.7/sysdeps/stub/stubs.c
---- discover-2.0.7.old/sysdeps/stub/stubs.c 2003-11-17 05:25:01.000000000 +0100
-+++ discover-2.0.7/sysdeps/stub/stubs.c 2006-04-26 10:00:26.000000000 +0200
-@@ -35,7 +35,7 @@
-
- #include <config.h>
-
--#include <sysdep.h>
-+#include <discover/sysdep.h>
-
- #include <stdio.h> /* For NULL */
-
Deleted: trunk/web/patches/dmake.diff
===================================================================
--- trunk/web/patches/dmake.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/dmake.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,37 +0,0 @@
-
-Status: sent to dev at porting.openoffice.org
-
-diff -ur old/dmake-4.3/configure dmake-4.3/configure
---- old/dmake-4.3/configure 2004-10-12 20:47:46.000000000 +0200
-+++ dmake-4.3/configure 2005-05-05 18:49:10.000000000 +0200
-@@ -6596,7 +6596,7 @@
- "SunOS")
- OS_VERSION=solaris
- ;;
-- "Linux")
-+ *)
- OS_VERSION=linux
- ;;
- "CYGWIN")
-diff -ur old/dmake-4.3/configure.in dmake-4.3/configure.in
---- old/dmake-4.3/configure.in 2004-10-12 21:07:26.000000000 +0200
-+++ dmake-4.3/configure.in 2005-05-05 18:49:12.000000000 +0200
-@@ -84,7 +84,7 @@
- "SunOS")
- OS_VERSION=solaris
- ;;
-- "Linux")
-+ Linux|GNU|GNU/*)
- OS_VERSION=linux
- ;;
- "CYGWIN")
-@@ -116,9 +116,6 @@
- "IRIX64")
- OS_VERSION=sysvr4
- ;;
-- "GNU")
-- OS_VERSION=linux
-- ;;
- "AIX")
- OS_VERSION=sysvr4
- ;;
Deleted: trunk/web/patches/drift.diff
===================================================================
--- trunk/web/patches/drift.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/drift.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,16 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u drift-2.1.2/debian/control drift-2.1.2/debian/control
---- drift-2.1.2/debian/control
-+++ drift-2.1.2/debian/control
-@@ -2,7 +2,7 @@
- Section: devel
- Priority: optional
- Maintainer: Arjan Oosting <arjanoosting at home.nl>
--Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, debhelper (>= 4.1.0), ghc6 [alpha amd64 hppa i386 ia64 m68k powerpc s390 sparc] | nhc98 [arm hppa i386 mips mipsel powerpc s390], tetex-bin, texinfo, texi2html
-+Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, debhelper (>= 4.1.0), ghc6 [alpha amd64 hppa i386 kfreebsd-i386 ia64 m68k powerpc s390 sparc] | nhc98 [arm hppa i386 kfreebsd-i386 mips mipsel powerpc s390], tetex-bin, texinfo, texi2html
- Standards-Version: 3.6.2
-
- Package: drift
-
Deleted: trunk/web/patches/erlang.diff
===================================================================
--- trunk/web/patches/erlang.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/erlang.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,25 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u erlang-10.b.7/erts/configure.in erlang-10.b.7/erts/configure.in
---- erlang-10.b.7/erts/configure.in
-+++ erlang-10.b.7/erts/configure.in
-@@ -69,7 +69,7 @@
- AC_CONFIG_HEADER($host/config.h:config.h.in include/internal/$host/ethread_header_config.h:include/internal/ethread_header_config.h.in)
-
- case $host_os in
-- linux*) AC_DEFINE(_GNU_SOURCE, 1, \
-+ *gnu*) AC_DEFINE(_GNU_SOURCE, 1, \
- [Define if you want to turn on some gnu features.]) ;;
- *) ;;
- esac
-@@ -464,7 +464,7 @@
- ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS threads"
- case $host_os in
- solaris*) AC_DEFINE(ENABLE_CHILD_WAITER_THREAD) ;;
-- linux*) AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX) ;;
-+ *gnu*) AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX) ;;
- *) ;;
- esac
- fi
-
Deleted: trunk/web/patches/fam.diff
===================================================================
--- trunk/web/patches/fam.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/fam.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,163 +0,0 @@
-
-Authors: rmh and aurel32
-Status: in BTS.
-
-diff -Nur fam-2.7.0.old/debian/patches/01_dnotify.patch fam-2.7.0/debian/patches/01_dnotify.patch
---- fam-2.7.0.old/debian/patches/01_dnotify.patch 2005-08-27 14:27:23.000000000 +0200
-+++ fam-2.7.0/debian/patches/01_dnotify.patch 2005-08-27 14:58:56.000000000 +0200
-@@ -21,7 +21,7 @@
- +use_dnotify=false
- +AC_MSG_RESULT($have_dnotify)
- +
--+if test "$have_dnotify"; then
-++if test "$have_dnotify" = "yes" ; then
- + MONITOR_FUNCS=IMonNone
- + AC_DEFINE(USE_DNOTIFY)
- + use_dnotify=true
-@@ -103,7 +103,7 @@
- unchanged:
- --- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ fam-2.7.0/src/DNotify.c++ 2005-05-05 22:08:43.000000000 -0700
--@@ -0,0 +1,655 @@
-+@@ -0,0 +1,659 @@
- +// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved.
- +// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved.
- +//
-@@ -127,6 +127,9 @@
- +// with this program; if not, write the Free Software Foundation, Inc., 59
- +// Temple Place - Suite 330, Boston MA 02111-1307, USA.
- +
-++#include "config.h" /* USE_DNOTIFY */
-++#ifdef USE_DNOTIFY
-++
- +#define _GNU_SOURCE
- +#include <fcntl.h>
- +
-@@ -759,6 +762,7 @@
- + }
- +}
- +
-++#endif /* USE_DNOTIFY */
- only in patch2:
- unchanged:
- --- /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -911,11 +915,13 @@
- unchanged:
- --- fam-2.7.0.orig/src/Interest.c++ 2003-01-18 06:18:12.000000000 -0800
- +++ fam-2.7.0/src/Interest.c++ 2005-05-05 22:08:42.000000000 -0700
--@@ -42,12 +42,21 @@
-+@@ -42,12 +42,23 @@
- #include "Event.h"
- #include "FileSystem.h"
- #include "IMon.h"
-++#ifdef USE_DNOTIFY
- +#include "DNotify.h"
-++#endif
- #include "Log.h"
- #include "Pollster.h"
- #include "timeval.h"
-@@ -934,7 +940,7 @@
- bool Interest::xtab_verification = true;
-
- Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
--@@ -59,11 +68,11 @@
-+@@ -59,11 +70,11 @@
- myhost(host),
- mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
- {
-@@ -951,7 +957,7 @@
- { int rc = lstat(name, &old_stat);
- if (rc < 0)
- { Log::info("can't lstat %s", name);
--@@ -100,7 +109,7 @@
-+@@ -100,7 +111,7 @@
- }
- #endif
-
-@@ -960,7 +966,7 @@
- }
-
- Interest::~Interest()
--@@ -128,7 +137,7 @@
-+@@ -128,7 +139,7 @@
- pp = &p->hashlink; // move to next element
- }
- if (!found_same)
-@@ -969,7 +975,7 @@
- }
- }
-
--@@ -147,7 +156,7 @@
-+@@ -147,7 +158,7 @@
-
- // Express interest.
- IMon::Status s = IMon::BAD;
-@@ -978,7 +984,7 @@
- if (s != IMon::OK) {
- return true;
- }
--@@ -248,23 +257,23 @@
-+@@ -248,23 +259,23 @@
- }
-
- void
-diff -Nur fam-2.7.0.old/debian/patches/08_sockaddr_un.patch fam-2.7.0/debian/patches/08_sockaddr_un.patch
---- fam-2.7.0.old/debian/patches/08_sockaddr_un.patch 1970-01-01 01:00:00.000000000 +0100
-+++ fam-2.7.0/debian/patches/08_sockaddr_un.patch 2005-08-27 15:23:45.000000000 +0200
-@@ -0,0 +1,56 @@
-+diff -ur fam-2.7.0.old/config.h.in fam-2.7.0/config.h.in
-+--- fam-2.7.0.old/config.h.in 2005-08-27 15:07:39.000000000 +0200
-++++ fam-2.7.0/config.h.in 2005-08-27 15:08:01.000000000 +0200
-+@@ -76,6 +76,9 @@
-+ /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
-+ #undef HAVE_STRUCT_SOCKADDR_SA_LEN
-+
-++/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */
-++#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-++
-+ /* Define to 1 if you have the <syslog.h> header file. */
-+ #undef HAVE_SYSLOG_H
-+
-+diff -ur fam-2.7.0.old/configure.ac fam-2.7.0/configure.ac
-+--- fam-2.7.0.old/configure.ac 2005-08-27 15:07:39.000000000 +0200
-++++ fam-2.7.0/configure.ac 2005-08-27 15:08:01.000000000 +0200
-+@@ -72,7 +72,8 @@
-+ AC_TYPE_PID_T
-+ AC_TYPE_SIZE_T
-+ AC_HEADER_TIME
-+-AC_CHECK_MEMBERS(struct sockaddr.sa_len, struct sockaddr_un.sun_len)
-++AC_CHECK_MEMBERS([struct sockaddr.sa_len],,, [#include <sys/socket.h>])
-++AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,, [#include <sys/un.h>])
-+
-+ # Checks for library functions.
-+ AC_FUNC_ERROR_AT_LINE
-+diff -ur fam-2.7.0.old/src/Listener.c++ fam-2.7.0/src/Listener.c++
-+--- fam-2.7.0.old/src/Listener.c++ 2005-08-27 15:07:39.000000000 +0200
-++++ fam-2.7.0/src/Listener.c++ 2005-08-27 15:08:01.000000000 +0200
-+@@ -209,7 +209,7 @@
-+ #endif
-+
-+ char *tmpfile = tempnam("/tmp", ".fam");
-+-#ifdef HAVE_SOCKADDR_SUN_LEN
-++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-+ sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
-+ #else
-+ sockaddr_un sun = { AF_UNIX, "" };
-+@@ -283,7 +283,7 @@
-+
-+ // Get the new socket.
-+
-+-#ifdef HAVE_SOCKADDR_SUN_LEN
-++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-+ struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
-+ #else
-+ struct sockaddr_un sun = { AF_UNIX, "" };
-+@@ -357,7 +357,7 @@
-+ void
-+ Listener::dirty_ugly_hack()
-+ {
-+-#ifdef HAVE_SOCKADDR_SUN_LEN
-++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-+ static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
-+ #else
-+ static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
Deleted: trunk/web/patches/fcron.diff
===================================================================
--- trunk/web/patches/fcron.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/fcron.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,46 +0,0 @@
-diff -u fcron-3.0.0/debian/control fcron-3.0.0/debian/control
---- fcron-3.0.0/debian/control
-+++ fcron-3.0.0/debian/control
-@@ -3,7 +3,7 @@
- Priority: extra
- Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
- Uploaders: Russell Coker <russell at coker.com.au>
--Build-Depends: debhelper (>= 4.1.16), libpam0g-dev, libselinux1-dev (>= 1.2-1.1)
-+Build-Depends: debhelper (>= 4.1.16), libpam0g-dev, libselinux1-dev (>= 1.2-1.1) [!kfreebsd-i386 !hurd-i386]
- Standards-Version: 3.6.2
-
- Package: fcron
-diff -u fcron-3.0.0/debian/rules fcron-3.0.0/debian/rules
---- fcron-3.0.0/debian/rules
-+++ fcron-3.0.0/debian/rules
-@@ -9,6 +9,8 @@
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
-
-+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-+
- export DH_ALWAYS_EXCLUDE=CVS:.svn
-
- DEBUGFLAGS=-g
-@@ -21,6 +23,12 @@
- DEBUGFLAGS += -Werror
- endif
-
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+ SELINUX = --with-selinux=yes
-+else
-+ SELINUX = --with-selinux=no
-+endif
-+
- configure-stamp: configure
- dh_testdir
- ./configure CFLAGS="-Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
-@@ -30,7 +38,7 @@
- --with-spooldir=/var/spool/fcron \
- --with-etcdir=/etc \
- --with-sendmail=/usr/sbin/sendmail \
-- --with-selinux=yes
-+ $(SELINUX)
-
- touch configure-stamp
-
Deleted: trunk/web/patches/linux_soundcard.diff
===================================================================
--- trunk/web/patches/linux_soundcard.diff 2011-07-10 12:39:14 UTC (rev 3555)
+++ trunk/web/patches/linux_soundcard.diff 2011-07-10 12:44:04 UTC (rev 3556)
@@ -1,17 +0,0 @@
-
-Author: rmh
-Status: I hope to be able to merge this (at least in Debian) once Glibc
- defines _SYS_SOUNDCARD_H
-
---- linux-source-2.6.12/include/linux/soundcard.h 2005-06-17 21:48:29.000000000 +0200
-+++ linux-source-2.6.12/include/linux/soundcard.h 2005-08-12 13:38:43.000000000 +0200
-@@ -24,6 +22,9 @@
- * SUCH DAMAGE.
- */
-
-+#ifndef _SYS_SOUNDCARD_H
-+# warning "Never include <linux/soundcard.h> directly; use <sys/soundcard.h> instead."
-+#endif
-
- /*
- * OSS interface version. With versions earlier than 3.6 this value is
More information about the Glibc-bsd-commits
mailing list