Your message dated Tue, 29 Jun 2010 04:32:10 +0000
with message-id <e1otsuu-000525...@ries.debian.org>
and subject line Bug#587342: fixed in vtun 3.0.2-3
has caused the Debian Bug report #587342,
regarding vtun: Support tmpfs for /var/lock
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
587342: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587342
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: vtun
Version: 3.0.2-2.1
Severity: serious
Tags: patch
Justification: Policy 9.3.2
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch

Hi, in Ubuntu, we've applied the attached patch to achieve the following:

  * Merge from debian unstable (LP: #598053), remaining changes:
    - Clean up debian directory.
    - debian/control:
      + Added ${misc:Depends}. 
    - debian/patches/07-fix-gcc-warnings.patch: Fix gcc warnings.
    - debian/rules: Dont start vtun when there is nothing to start. 
      (LP: #420545)
    - debian/init.d: 
      + implemented status.
      + Create /var/lock/vtund directory. (LP: #571415)
  * Dropped changes:
    - Clean up debian directory: broken comment, it does not explain what 
      has been clean.

We thought you may be interested.  Some of those issues are pretty
small, and the gcc-warnings patch looks just hides bugs, but the init
script status feature would probably be useful to Debian.

In particular, the /var/lock on tmpfs fix should be applied in Debian.

SR

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  H: +27 21 465 6908 C: +27 72 419 8559  UCT: x3127
diff -u vtun-3.0.2/debian/control vtun-3.0.2/debian/control
--- vtun-3.0.2/debian/control
+++ vtun-3.0.2/debian/control
@@ -10,7 +11,7 @@
 
 Package: vtun
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: virtual tunnel over TCP/IP networks
  VTun is the easiest way to create virtual tunnels over TCP/IP networks
  with traffic shaping and compression.
diff -u vtun-3.0.2/debian/init.d vtun-3.0.2/debian/init.d
--- vtun-3.0.2/debian/init.d
+++ vtun-3.0.2/debian/init.d
@@ -28,6 +28,8 @@
         . /etc/default/$NAME
 fi
 
+mkdir -p /var/lock/vtund
+
 case "$1" in
     start)
         if [ -f /etc/vtund-start.conf ]; then
@@ -73,6 +75,13 @@
             rm -f $i
         done
         ;;
+    status)
+    for i in 0 1 2 3 4 5 6 7 8 9; do
+        eval name=\$CLIENT${i}_NAME
+        eval host=\$CLIENT${i}_HOST
+        status_of_proc -p $PIDPREFIX.$name-$host.pid $DAEMON vtund && e$
+    done
+    ;;
     reload|force-reload)
         echo "Reloading vtund.";
         for i in $PIDPREFIX*.pid; do
@@ -86,7 +95,7 @@
         $0 start
         ;;
     *)
-        echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+        echo "Usage: $0 {start|stop|restart|reload|status|force-reload}" >&2
         exit 1
         ;;
 esac
diff -u vtun-3.0.2/debian/rules vtun-3.0.2/debian/rules
--- vtun-3.0.2/debian/rules
+++ vtun-3.0.2/debian/rules
@@ -78,7 +78,7 @@
 	dh_installexamples
 	dh_install
 	dh_installlogrotate
-	dh_installinit --no-restart-on-upgrade
+	dh_installinit --no-start
 	dh_installman
 	dh_link
 	dh_strip
diff -u vtun-3.0.2/debian/patches/series vtun-3.0.2/debian/patches/series
--- vtun-3.0.2/debian/patches/series
+++ vtun-3.0.2/debian/patches/series
@@ -7,0 +8 @@
+07-fix-gcc-warnings.patch
only in patch2:
unchanged:
--- vtun-3.0.2.orig/debian/patches/07-fix-gcc-warnings.patch
+++ vtun-3.0.2/debian/patches/07-fix-gcc-warnings.patch
@@ -0,0 +1,57 @@
+diff -Naurp vtun-3.0.2.orig/main.c vtun-3.0.2/main.c
+--- vtun-3.0.2.orig/main.c	2008-01-07 17:35:53.000000000 -0500
++++ vtun-3.0.2/main.c	2009-08-14 13:00:19.000000000 -0400
+@@ -53,6 +53,7 @@ extern char *optarg;
+ int main(int argc, char *argv[], char *env[])
+ {
+      int svr, daemon, sock, dofork, fd, opt;
++     int ret;
+      struct vtun_host *host = NULL;
+      struct sigaction sa;
+      char *hst;
+@@ -175,14 +176,14 @@ int main(int argc, char *argv[], char *e
+ 
+         /* Direct stdin,stdout,stderr to '/dev/null' */
+         fd = open("/dev/null", O_RDWR);
+-	close(0); dup(fd);
+-	close(1); dup(fd);
+-        close(2); dup(fd);
++	close(0); ret = dup(fd);
++	close(1); ret = dup(fd);
++        close(2); ret = dup(fd);
+         close(fd);
+ 
+ 	setsid();
+ 
+-	chdir("/");
++	ret = chdir("/");
+      }
+ 
+      if(svr){
+diff -Naurp vtun-3.0.2.orig/tunnel.c vtun-3.0.2/tunnel.c
+--- vtun-3.0.2.orig/tunnel.c	2008-01-07 17:36:03.000000000 -0500
++++ vtun-3.0.2/tunnel.c	2009-08-14 13:02:23.000000000 -0400
+@@ -71,6 +71,7 @@ int (*proto_read)(int fd, char *buf);
+ int tunnel(struct vtun_host *host)
+ {
+      int null_fd, pid, opt;
++     int ret;
+      int fd[2]={-1, -1};
+      char dev[VTUN_DEV_LEN]="";
+      int interface_already_open = 0;
+@@ -168,12 +169,12 @@ int tunnel(struct vtun_host *host)
+ 	         case VTUN_PIPE:
+ 		    null_fd = open("/dev/null", O_RDWR);
+ 		    close(fd[0]);
+-		    close(0); dup(fd[1]);
+-		    close(1); dup(fd[1]);
++		    close(0); ret = dup(fd[1]);
++		    close(1); ret = dup(fd[1]);
+ 		    close(fd[1]);
+ 
+ 		    /* Route stderr to /dev/null */
+-		    close(2); dup(null_fd);
++		    close(2); ret = dup(null_fd);
+ 		    close(null_fd);
+ 		    break;
+ 	         case VTUN_ETHER:

--- End Message ---
--- Begin Message ---
Source: vtun
Source-Version: 3.0.2-3

We believe that the bug you reported is fixed in the latest version of
vtun, which is due to be installed in the Debian FTP archive:

vtun_3.0.2-3.diff.gz
  to main/v/vtun/vtun_3.0.2-3.diff.gz
vtun_3.0.2-3.dsc
  to main/v/vtun/vtun_3.0.2-3.dsc
vtun_3.0.2-3_i386.deb
  to main/v/vtun/vtun_3.0.2-3_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 587...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Martín Ferrari <tin...@debian.org> (supplier of updated vtun package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 29 Jun 2010 06:25:15 +0200
Source: vtun
Binary: vtun
Architecture: source i386
Version: 3.0.2-3
Distribution: unstable
Urgency: low
Maintainer: Martín Ferrari <tin...@debian.org>
Changed-By: Martín Ferrari <tin...@debian.org>
Description: 
 vtun       - virtual tunnel over TCP/IP networks
Closes: 477707 518314 535720 587342
Changes: 
 vtun (3.0.2-3) unstable; urgency=low
 .
   * Stop installing deprecated modutils conffile. (Closes: #518314).
   * Acknowledging NMU. Thanks Gregor.
   * debian/rules: update config.{sub,guess} before each build, closes:
     #535720.
   * debian/patches: added 07-64bits-segfault.patch, closes: #477707.
   * debian/init.d, debian/rules: support for tmpfs in /var, thanks to Stefano
     Rivera. Closes: #587342.
   * debian/copyright: add exception note for OpenSSL, thanks to Stefano too.
   * debian/control: add ${misc:Depends}; bump Standards-Version with no
     changes.
   * debian/init.d: remove run-level 1 from Default-Stop; sendsigs will take
     care.
   * debian/postinst: try to detect udev before calling makedev; remove the
     devfs check.
   * debian/control: add dependency on udev or makedev.
   * debian/init.d: add status command, thanks to Stefano Rivera.
Checksums-Sha1: 
 46da53fc5d29435c1e05624c3feed4daf711099c 1100 vtun_3.0.2-3.dsc
 33a169bcfe1c099e8e90c9cd604d77900ee3eee9 22097 vtun_3.0.2-3.diff.gz
 40c26743f5aa1ee9af0cdeaf29ca115ae891e2f7 66144 vtun_3.0.2-3_i386.deb
Checksums-Sha256: 
 3e421f02262b3a955ec32219dbebd2c94e5831fce10c8d89db1cba0f8274507b 1100 
vtun_3.0.2-3.dsc
 7ccd6034b6ce4d07702d7b0b46da2dcdc462ebe4feb7a421eb9754741837d8a6 22097 
vtun_3.0.2-3.diff.gz
 3ec7b53bcd3748834304d083cb67c7b81b6acb22651e3530f71550a6ff67c7b2 66144 
vtun_3.0.2-3_i386.deb
Files: 
 f003039b091b67bc525ca929b3ce5cb5 1100 net optional vtun_3.0.2-3.dsc
 7a70d9f10d1c4dd66c90286136c9336f 22097 net optional vtun_3.0.2-3.diff.gz
 c121e479031c92843872730a671a26d1 66144 net optional vtun_3.0.2-3_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkwpdlMACgkQaWQ2v1ddCnaxCgCePQNqQoDjU+y7uJtrhhoT5FTX
QUYAn0NoxxJTEo2e10yySbYF3SU3tADe
=cYBm
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to