From 74c3b6c8315a7049c481851c5f93f26d8894315f Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Tue, 18 Mar 2008 04:10:08 +0000
Subject: applied changes from 03964808c40cbc7460d4711fae17d07972e6ceb6        
      through 1b6b8412e77f2d8600a5b7bf7e70948e38007d48
 1b6b8412e77f2d8600a5b7bf7e70948e38007d48 openvpn: unify. (xjqian PaulS)

---
 packages/openvpn/openvpn.inc      | 21 +++++++++++++++++++++
 packages/openvpn/openvpn_1.5.0.bb | 18 ++----------------
 packages/openvpn/openvpn_1.6.0.bb | 20 ++------------------
 packages/openvpn/openvpn_2.0.2.bb | 23 ++---------------------
 packages/openvpn/openvpn_2.0.9.bb | 23 ++---------------------
 packages/openvpn/openvpn_2.0.bb   | 23 ++---------------------
 6 files changed, 31 insertions(+), 97 deletions(-)
 create mode 100644 packages/openvpn/openvpn.inc

diff --git a/packages/openvpn/openvpn.inc b/packages/openvpn/openvpn.inc
new file mode 100644
index 0000000000..70cdf4c84e
--- /dev/null
+++ b/packages/openvpn/openvpn.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "A full-featured SSL VPN solution via tun device."
+HOMEPAGE = "http://openvpn.sourceforge.net"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "lzo openssl"
+RDEPENDS = "kernel-module-tun"
+
+SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
+	file://openvpn"
+S = "${WORKDIR}/openvpn-${PV}"
+
+CFLAGS += "-fno-inline"
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sysconfdir}/openvpn
+	install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
+}
diff --git a/packages/openvpn/openvpn_1.5.0.bb b/packages/openvpn/openvpn_1.5.0.bb
index 49fb233e3a..12cebf5bcd 100644
--- a/packages/openvpn/openvpn_1.5.0.bb
+++ b/packages/openvpn/openvpn_1.5.0.bb
@@ -1,17 +1,3 @@
-SECTION = "console/network"
-DESCRIPTION = "A VPN solution via tun device.  Not IPSEC!"
-PRIORITY = "optional"
-DEPENDS = "lzo openssl"
-RRECOMMENDS = "kernel-module-tun"
-PR = "r2"
-LICENSE = "GPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
-	file://openvpn"
+require openvpn.inc
 
-inherit autotools
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}${sysconfdir}/init.d
-}
+PR = "r3"
diff --git a/packages/openvpn/openvpn_1.6.0.bb b/packages/openvpn/openvpn_1.6.0.bb
index 387c0a9291..5bb4a2822b 100644
--- a/packages/openvpn/openvpn_1.6.0.bb
+++ b/packages/openvpn/openvpn_1.6.0.bb
@@ -1,19 +1,3 @@
-SECTION = "console/network"
-DESCRIPTION = "A VPN solution via tun device.  Not IPSEC!"
-HOMEPAGE = "http://openvpn.sourceforge.net"
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "lzo openssl"
-RRECOMMENDS = "kernel-module-tun"
-PR = "r1"
+require openvpn.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
-	file://openvpn"
-
-inherit autotools
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}${sysconfdir}/init.d
-}
+PR = "r2"
diff --git a/packages/openvpn/openvpn_2.0.2.bb b/packages/openvpn/openvpn_2.0.2.bb
index badac9b551..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.2.bb
+++ b/packages/openvpn/openvpn_2.0.2.bb
@@ -1,22 +1,3 @@
-DESCRIPTION = "A full-featured SSL VPN solution via tun device."
-HOMEPAGE = "http://openvpn.sourceforge.net"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
-PR = "r0"
+require openvpn.inc
 
-SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
-	file://openvpn"
-S = "${WORKDIR}/openvpn-${PV}"
-
-CFLAGS += "-fno-inline"
-
-inherit autotools
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
-}
+PR = "r1"
diff --git a/packages/openvpn/openvpn_2.0.9.bb b/packages/openvpn/openvpn_2.0.9.bb
index badac9b551..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.9.bb
+++ b/packages/openvpn/openvpn_2.0.9.bb
@@ -1,22 +1,3 @@
-DESCRIPTION = "A full-featured SSL VPN solution via tun device."
-HOMEPAGE = "http://openvpn.sourceforge.net"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
-PR = "r0"
+require openvpn.inc
 
-SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
-	file://openvpn"
-S = "${WORKDIR}/openvpn-${PV}"
-
-CFLAGS += "-fno-inline"
-
-inherit autotools
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
-}
+PR = "r1"
diff --git a/packages/openvpn/openvpn_2.0.bb b/packages/openvpn/openvpn_2.0.bb
index bea71b9c44..bb22dc9059 100644
--- a/packages/openvpn/openvpn_2.0.bb
+++ b/packages/openvpn/openvpn_2.0.bb
@@ -1,22 +1,3 @@
-SECTION = "console/network"
-DESCRIPTION = "A full-featured SSL VPN solution via tun device."
-HOMEPAGE = "http://openvpn.sourceforge.net"
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
-PR = "r1"
-
-SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
-	file://openvpn"
-S = "${WORKDIR}/openvpn-${PV}"
-
-CFLAGS += "-fno-inline"
+require openvpn.inc
 
-inherit autotools
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
-}
+PR = "r1"
-- 
cgit 1.2.3-korg