includes the changes we had backported in openlog.patch, so remove the
authorgregor herrmann <gregoa@debian.org>
Sat, 3 Jul 2010 16:21:29 +0000 (16:21 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 3 Jul 2010 16:21:29 +0000 (16:21 -0000)
patch now

debian/changelog
debian/patches/openlog.patch [deleted file]
debian/patches/series

index 3a2ce8e07b16c5ed02f6f90b149a0cf718df1e4e..4a5f308c04fc557ca46ba98506ede9531ca7eccc 100644 (file)
@@ -4,6 +4,8 @@ iodine (0.6.0~rc1-1) UNRELEASED; urgency=low
   * New upstream release:
     - return nonzero if tunnel fails to open (closes: #534186)
     - added support for CNAME/TXT/A/MX query types (closes: #587894)
+    - includes the changes we had backported in openlog.patch, so remove the
+      patch now
 
  -- gregor herrmann <gregoa@debian.org>  Sat, 03 Jul 2010 18:11:37 +0200
 
diff --git a/debian/patches/openlog.patch b/debian/patches/openlog.patch
deleted file mode 100644 (file)
index d9391bc..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: Romain Francoise <rfrancoise@debian.org>
-Description:  When iodined runs chrooted it doesn't log anything because
- /dev/log doesn't exist in the chroot and it calls openlog() too late (after
- chrooting). This is upstream ticket #86, and it was fixed by moving the
- openlog() call before chrooting (revisions 914 and 963 of iodined.c),
- resulting in the following patch.
-Bug: http://dev.kryo.se/iodine/ticket/86
-Bug-Debian: http://bugs.debian.org/573194
-Origin: upstream, http://dev.kryo.se/iodine/changeset/914, http://dev.kryo.se/iodine/changeset/963
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2010-03-10
-
---- a/src/iodined.c
-+++ b/src/iodined.c
-@@ -1166,6 +1166,13 @@
-       if (foreground == 0) 
-               do_detach();
-       
-+#ifdef FREEBSD
-+      tzsetwall();
-+#endif
-+#ifndef WINDOWS32
-+      openlog( __progname, LOG_NDELAY, LOG_DAEMON );
-+#endif
-+
-       if (newroot != NULL)
-               do_chroot(newroot);
-@@ -1181,9 +1188,6 @@
- #endif
-       }
--#ifndef WINDOWS32
--      openlog(__progname, LOG_NOWAIT, LOG_DAEMON);
--#endif
-       syslog(LOG_INFO, "started, listening on port %d", port);
-       
-       tunnel(tun_fd, dnsd_fd, bind_fd);
index 51f811541858ebf45a102ebf4e9f75c4ed04d894..707ddf5454f0c96294d2b04a56ca0f5ef8863042 100644 (file)
@@ -1,3 +1,2 @@
 03_cflags.patch
 spelling.patch
-openlog.patch