[arch-commits] Commit in openvpn/repos (3 files)

[Thomas Bächler]

    Date: Saturday, July 25, 2009 @ 07:51:05
  Author: thomas
Revision: 47697

Merged revisions 47207,47594,47664,47695 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/openvpn/trunk

........
  r47207 | thomas | 2009-07-23 16:04:27 +0200 (Do, 23 Jul 2009) | 2 lines
  
  Correct upstream source URL
........
  r47594 | thomas | 2009-07-24 11:57:28 +0200 (Fr, 24 Jul 2009) | 2 lines
  
  Correct minor error in the rc.d script
........
  r47664 | thomas | 2009-07-25 02:18:13 +0200 (Sa, 25 Jul 2009) | 2 lines
  
  Fix another typo in the rc.d script
........
  r47695 | thomas | 2009-07-25 13:50:09 +0200 (Sa, 25 Jul 2009) | 1 line
  
  upgpkg: openvpn 2.1_rc19-2
........

Modified:
  openvpn/repos/testing-i686/	(properties)
  openvpn/repos/testing-i686/PKGBUILD
  openvpn/repos/testing-i686/openvpn.rc

------------+
 PKGBUILD   |    6 +++---
 openvpn.rc |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


Property changes on: openvpn/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openvpn/trunk:1-47205
   + /openvpn/trunk:1-47696

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-07-25 11:50:26 UTC (rev 47696)
+++ testing-i686/PKGBUILD	2009-07-25 11:51:05 UTC (rev 47697)
@@ -3,10 +3,10 @@
 
 pkgname=openvpn
 pkgver=2.1_rc19
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64)
-url="http://openvpn.sourceforge.net/"
+url="http://openvpn.net/index.php/open-source.html"
 depends=('openssl' 'lzo2')
 license=('custom')
 backup=(usr/share/openvpn/easy-rsa/vars
@@ -17,7 +17,7 @@
         openvpn-tapdev.rc
         openvpn-tapdev.conf)
 md5sums=('ba2ee667a8b7606b125b7d32f47ca578'
-         '90f37d4338cfc28d7a4e2d47a15bde54'
+         '49fea9a53343546a2256853256af510a'
          '7576704ea86a781589e0b5eef469b693'
          '722f483c9e3ce2ec66d3301aaf7cf3d5')
 

Modified: testing-i686/openvpn.rc
===================================================================
--- testing-i686/openvpn.rc	2009-07-25 11:50:26 UTC (rev 47696)
+++ testing-i686/openvpn.rc	2009-07-25 11:51:05 UTC (rev 47697)
@@ -13,7 +13,7 @@
     mkdir -p "${STATEDIR}"
     for cfg in "${CFGDIR}"/*.conf; do
       stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success = $!
+      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$!
     done
     if [ $success -eq 0 ]; then
       add_daemon openvpn
@@ -25,7 +25,7 @@
   stop)
     stat_busy "Stopping OpenVPN ..."
     for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${cfg}" .conf) "
+      stat_append "$(basename "${pidfile}" .pid) "
       kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
       rm -f "${pidfile}"
     done