- hides password from ps and stdin (closes: #432719).
authorgregor herrmann <gregoa@debian.org>
Sat, 1 Dec 2007 01:02:35 +0000 (01:02 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 1 Dec 2007 01:02:35 +0000 (01:02 -0000)
  - uses /etc/resolv.conf (closes: #432867).
  - incorporates patch to daemonize before chrooting and dropping
    privileges, therefore dropping 02_detach.dpatch.
  - uses $(MAKE) in Makefile.
  - fixes the install dir for the manpage, therefore adapting patch
    01_mandir.dpatch.

debian/changelog
debian/patches/00list
debian/patches/01_mandir.dpatch
debian/patches/02_detach.dpatch [deleted file]
debian/rules

index c9c00d470211e7b35436ec681a5db7ff1955114e..71b9d76271b8e5a94515f14675dcfcc2b937d506 100644 (file)
@@ -1,6 +1,13 @@
 iodine (0.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release:
+    - hides password from ps and stdin (closes: #432719).
+    - uses /etc/resolv.conf (closes: #432867).
+    - incorporates patch to daemonize before chrooting and dropping
+      privileges, therefore dropping 02_detach.dpatch.
+    - uses $(MAKE) in Makefile.
+    - fixes the install dir for the manpage, therefore adapting patch
+      01_mandir.dpatch.
 
  -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat, 01 Dec 2007 01:43:40 +0100
 
index 713581a6bdba4a04fcf490b9cdc72bc83938d32d..25797c5fc5690bd0af7f55601c071439e9455b52 100644 (file)
@@ -1,2 +1 @@
 01_mandir
-02_detach
index 0c4143467739b6c0115e453e5b489544803304de..7393b4e58596febc25a8cc06ee1110e3abd7aaea 100755 (executable)
@@ -2,33 +2,13 @@
 ## 01_mandir.dpatch by  <gregor+debian@comodo.priv.at>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No fix path to dir for manpage in Makefile and escape - in manpage
+## DP: escape - in manpage
 
 @DPATCH@
-diff -urNad iodine~/Makefile iodine/Makefile
---- iodine~/Makefile   2007-03-30 21:35:47.000000000 +0200
-+++ iodine/Makefile    2007-03-30 22:27:43.000000000 +0200
-@@ -16,13 +16,13 @@
-       $(MKDIR) $(MKDIR_FLAGS) $(PREFIX)/sbin
-       $(INSTALL) $(INSTALL_FLAGS) bin/iodine $(PREFIX)/sbin/iodine
-       $(INSTALL) $(INSTALL_FLAGS) bin/iodined $(PREFIX)/sbin/iodined
--      $(MKDIR) $(MKDIR_FLAGS) $(PREFIX)/man/man8
--      $(INSTALL) $(INSTALL_FLAGS) man/iodine.8 $(PREFIX)/man/man8/iodine.8
-+      $(MKDIR) $(MKDIR_FLAGS) $(PREFIX)/share/man/man8
-+      $(INSTALL) $(INSTALL_FLAGS) man/iodine.8 $(PREFIX)/share/man/man8/iodine.8
- uninstall:
-       $(RM) $(RM_FLAGS) $(PREFIX)/sbin/iodine
-       $(RM) $(RM_FLAGS) $(PREFIX)/sbin/iodined
--      $(RM) $(RM_FLAGS) $(PREFIX)/man/man8/iodine.8
-+      $(RM) $(RM_FLAGS) $(PREFIX)/share/man/man8/iodine.8
-       
- test: all
-       @(cd tests; make all)
 diff -urNad iodine~/man/iodine.8 iodine/man/iodine.8
---- iodine~/man/iodine.8       2007-03-30 21:35:47.000000000 +0200
-+++ iodine/man/iodine.8        2007-03-30 22:28:12.000000000 +0200
-@@ -121,13 +121,13 @@
+--- iodine~/man/iodine.8       2007-12-01 01:54:27.000000000 +0100
++++ iodine/man/iodine.8        2007-12-01 01:54:39.000000000 +0100
+@@ -124,13 +124,13 @@
  .TP
  Try it out within your own LAN! Follow these simple steps:
  .TP
@@ -44,7 +24,7 @@ diff -urNad iodine~/man/iodine.8 iodine/man/iodine.8
  (Replace 192.168.0.1 with the server's ip address)
  .TP
  - Enter the same password
-@@ -157,10 +157,10 @@
+@@ -160,10 +160,10 @@
  Now any DNS querys for domains ending with tunnel1.mytunnnel.com will be sent
  to your server. Start iodined on the server. The first argument is the tunnel
  IP address (like 192.168.99.1) and the second is the assigned domain (in this
diff --git a/debian/patches/02_detach.dpatch b/debian/patches/02_detach.dpatch
deleted file mode 100755 (executable)
index 1da24c9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_detach.dpatch by  <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: daemonize before chrooting.
-
-@DPATCH@
-diff -urNad iodine~/src/iodine.c iodine/src/iodine.c
---- iodine~/src/iodine.c       2007-03-30 21:35:42.000000000 +0200
-+++ iodine/src/iodine.c        2007-11-16 12:20:25.000000000 +0100
-@@ -564,6 +564,10 @@
-       
-       printf("Sending queries for %s to %s\n", argv[1], argv[0]);
-+      if (!foreground) {
-+              do_detach();
-+      }
-+
-       do_chroot(newroot);
-       
-       if (username) {
-@@ -573,10 +577,6 @@
-               }
-       }
-       
--      if (!foreground) {
--              do_detach();
--      }
--
-       tunnel(tun_fd, dns_fd);
- cleanup2:
index 93e0261e84bd863d72bc7f6e2ad09469bc388a3a..47e91a2430978790c08970c7d44e73f68b4d12fb 100755 (executable)
@@ -20,7 +20,7 @@ else
 endif
 
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp: $(DPATCH_STAMPFN)
        dh_testdir
        touch configure-stamp
 
@@ -42,7 +42,7 @@ clean: unpatch
 install: build
        dh_testdir
        dh_testroot
-       $(MAKE) install PREFIX=debian/iodine/usr 
+       $(MAKE) install prefix=debian/iodine/usr 
 
 
 # Build architecture-independent files here.