rpms/openvpn/devel BETA21-userpriv-fixups.patch, 1.1, 1.2 openvpn.spec, 1.34, 1.35

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	BETA21-userpriv-fixups.patch openvpn.spec 
Log Message:
Apply update to BETA21-userpriv-fixups.patch from Alon Bar-Lev.

BETA21-userpriv-fixups.patch:

Index: BETA21-userpriv-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/BETA21-userpriv-fixups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BETA21-userpriv-fixups.patch	25 Jan 2008 19:37:28 -0000	1.1
+++ BETA21-userpriv-fixups.patch	26 Jan 2008 01:46:41 -0000	1.2
@@ -1,8 +1,8 @@
 Index: openvpn/tun.c
 ===================================================================
 --- openvpn/tun.c	(revision 2677)
-+++ openvpn/tun.c	(revision 2679)
-@@ -1221,17 +1221,20 @@
++++ openvpn/tun.c	(revision 2682)
+@@ -1221,17 +1221,24 @@
    if (tt)
      {
  #ifdef CONFIG_FEATURE_IPROUTE
@@ -11,21 +11,27 @@
 -	 * Flush IP configuration for the device
 -	 */
 -	openvpn_snprintf (command_line, sizeof (command_line),
-+	if (tt->type != DEV_TYPE_NULL)
+-			  "%s addr flush dev %s",
++	if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig)
 +	  {
 +	    char command_line[256];
-+	    /*
-+	     * Flush IP configuration for the device
-+	     */
++	    struct gc_arena gc = gc_new ();
++
 +	    openvpn_snprintf (command_line, sizeof (command_line),
- 			  "%s addr flush dev %s",
++			  "%s addr del dev %s local %s peer %s",
  			  iproute_path,
- 			  tt->actual_name
+-			  tt->actual_name
++			  tt->actual_name,
++			  print_in_addr_t (tt->local, 0, &gc),
++			  print_in_addr_t (tt->remote_netmask, 0, &gc)
  			  );
 -	msg (M_INFO, "%s", command_line);
 -	system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
++
 +	    msg (M_INFO, "%s", command_line);
-+	    system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
++	    system_check (command_line, NULL, S_FATAL, "Linux ip addr del failed");
++
++	    gc_free (&gc);
 +	  }
  #endif
        close_tun_generic (tt);


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openvpn.spec	25 Jan 2008 19:37:28 -0000	1.34
+++ openvpn.spec	26 Jan 2008 01:46:41 -0000	1.35
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.22%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.23%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -166,6 +166,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Jan 25 2008 Steven Pritchard <steve at kspei.com> 2.1-0.23.rc6
+- Apply update to BETA21-userpriv-fixups.patch from Alon Bar-Lev
+
 * Thu Jan 24 2008 Steven Pritchard <steve at kspei.com> 2.1-0.22.rc6
 - Update to 2.1_rc6
 - Pass paths to ifconfig, ip, and route to configure