diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2009-05-28 17:57:05 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2009-05-28 17:57:05 +0000 |
| commit | b63383cef2b6dd26bedbafe5a5c48bb64bb809db (patch) | |
| tree | a42c65f18157c6f234cc197e0b84fd288278f830 /net-misc/openvpn | |
| parent | Fix alignment (bug #270867). (diff) | |
| download | historical-b63383cef2b6dd26bedbafe5a5c48bb64bb809db.tar.gz historical-b63383cef2b6dd26bedbafe5a5c48bb64bb809db.tar.bz2 historical-b63383cef2b6dd26bedbafe5a5c48bb64bb809db.zip | |
Fix invalid resolv.conf when DOMAIN is empty for bug #269614
Package-Manager: portage-2.1.6.11/cvs/Linux i686
Diffstat (limited to 'net-misc/openvpn')
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openvpn/Manifest | 4 | ||||
| -rwxr-xr-x | net-misc/openvpn/files/up.sh | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 57e8fcd885de..c929304d3d94 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openvpn # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.143 2009/04/15 22:00:31 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.144 2009/05/28 17:57:04 cedk Exp $ + + 28 May 2009; Cédric Krier <cedk@gentoo.org> files/up.sh: + Fix invalid resolv.conf when DOMAIN is empty for bug #269614 15 Apr 2009; Cédric Krier <cedk@gentoo.org> files/up.sh: Fix up.sh to add search for all domains for bug #259382 diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest index e716718ca6ab..a158885bdc79 100644 --- a/net-misc/openvpn/Manifest +++ b/net-misc/openvpn/Manifest @@ -7,7 +7,7 @@ AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e6 AUX openvpn-2.1.init 4207 RMD160 07da4fa43c55f4096c3a59a8229ec0a790da1fa8 SHA1 22fab45a9c14ee6aabe96f060d14c0940f3fe94b SHA256 a0cc87fdb10928c9c6b820482a2551ee17599253cb43186dd4ea47f55f0dab06 AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aabadee2cbb6ce9c4196b2730922491a96f003 SHA256 c074126c90d35c04a7316f4533cd00e9e14849e4e222ca5b87e6172f401ec95d -AUX up.sh 2569 RMD160 415734d6cf2f4303d7e7030fb35e2589c1ba1e75 SHA1 6ec5b210840292808658998bff7814d6c921876b SHA256 c323a2945aa5b027c3287fa3a8702761860f77afa854ddfbfa707bc24faafe17 +AUX up.sh 2594 RMD160 17576f73e6de08828aeda2a8776b4a36331fa855 SHA1 4eb4d1e857053f86ea886dec8e8e6f45174df774 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e DIST openvpn-2.0.9.tar.gz 669076 RMD160 e2b73071c8d6e9fba93afe46355a35882773d936 SHA1 6e900994bc9e4a14096173931c565ac27b0e7bb5 SHA256 347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9 @@ -16,5 +16,5 @@ EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 EBUILD openvpn-2.0.7-r2.ebuild 4172 RMD160 20ac6a2726f08b589c6b22e196383d41a7db13b7 SHA1 fe6a371e34774fbb6bd68602139345507c876460 SHA256 395d029244561a41faf21bb61f947e2f426f6b417163aadf5e47375878b70d95 EBUILD openvpn-2.0.9.ebuild 4174 RMD160 3eb65eeccfdc37f5ccd718e5d4934e4d60672061 SHA1 559acebad7131994ccb81e520ca08efefaa918fb SHA256 67d348cda2c182f7ed6f4c69b102e0ae3c0c2ee4e82c2dea679a4a1480c371f1 EBUILD openvpn-2.1_rc15.ebuild 4392 RMD160 22f11a5efaf2f1b96dfe740110101bad17dd25b1 SHA1 6a42a3247693826c7f2ae86c415f17ab9f94f46e SHA256 babf4cf77aab3e0a3b511947b0867272914ed2996f390bce612b066c4c2da97a -MISC ChangeLog 22684 RMD160 ff2034acda32847b8f389bd261f6681c3e08ade9 SHA1 2db91d215325020ba656413a8f8de7d4dcdea9ca SHA256 e966dd08d276516af28821061f1e06dec63d2f23ecc59b633ee73decb0a0b594 +MISC ChangeLog 22808 RMD160 60fb2e8d5af6e21e56a1bc7df4583f11cfc38161 SHA1 5576ecb9ec9cbe97348ad3df5d4b3864c7a80d62 SHA256 24fab35d661eac7033306e73ada087aa211cdba653e08fbb6381b5fbb68e8323 MISC metadata.xml 681 RMD160 38d44e8ca26011bef8b9072c41b7797dd32184bf SHA1 304f109764fe69865bf4ea490b8d3a6839a5ab9e SHA256 6f6898ac4534eeed083629ee9c581da086a65b728af16306d3a39edf100e7911 diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh index c47c34aabad4..4a8868702de5 100755 --- a/net-misc/openvpn/files/up.sh +++ b/net-misc/openvpn/files/up.sh @@ -43,7 +43,7 @@ if [ "${PEER_DNS}" != "no" ]; then DNS="# Generated by openvpn for interface ${dev}\n" if [ -n "${SEARCH}" ] ; then DNS="${DNS}search ${DOMAIN} ${SEARCH}\n" - else + elif [ -n "${DOMAIN}" ]; then DNS="${DNS}domain ${DOMAIN}\n" fi DNS="${DNS}${NS}" |