From 9f6c8550e721bb7f16f98edf6203922d5f0d6eee Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 2 Apr 2005 03:18:04 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/04/01 22:17:39-05:00 handhelds.org!kergoth Add stunnel 4.09, fix the stunnel configure patch to be a proper fix rather than a hack so that it can be sent upstream, and consolodate metadata into a .inc. BKrev: 424e0eecxQOI96UmxS4cwaEYAv3Szg --- packages/stunnel/stunnel-4.05/configure.patch | 37 +++++++++++++++++++++++++++ packages/stunnel/stunnel-4.09/automake.patch | 0 packages/stunnel/stunnel-4.09/configure.patch | 0 packages/stunnel/stunnel.inc | 0 packages/stunnel/stunnel_4.05.bb | 27 +++---------------- packages/stunnel/stunnel_4.09.bb | 0 6 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 packages/stunnel/stunnel-4.09/automake.patch create mode 100644 packages/stunnel/stunnel-4.09/configure.patch create mode 100644 packages/stunnel/stunnel.inc create mode 100644 packages/stunnel/stunnel_4.09.bb (limited to 'packages') diff --git a/packages/stunnel/stunnel-4.05/configure.patch b/packages/stunnel/stunnel-4.05/configure.patch index e69de29bb2..5764796aaa 100644 --- a/packages/stunnel/stunnel-4.05/configure.patch +++ b/packages/stunnel/stunnel-4.05/configure.patch @@ -0,0 +1,37 @@ +Index: stunnel-4.05/configure.ac +=================================================================== +--- stunnel-4.05.orig/configure.ac 2003-12-28 15:47:49.000000000 -0500 ++++ stunnel-4.05/configure.ac 2005-04-01 22:14:39.751121880 -0500 +@@ -176,8 +176,30 @@ + [AC_MSG_RESULT([no])]; LIBS="$saved_LIBS") + + dnl Check PTY device files. +-AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) +-AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) ++AC_ARG_WITH(ptmx, ++ [ --with-ptmx /dev/ptmx exists (default: check for existance)], ++ [ ++ if test x"$withval" = "xyes"; then ++ AC_DEFINE(HAVE_DEV_PTMX) ++ fi ++ ], ++ [ ++ # Check for ptmx device ++ AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX)) ++ ] ++) ++AC_ARG_WITH(ptc, ++ [ --with-ptc /dev/ptc exists (default: check for existance)], ++ [ ++ if test x"$withval" = "xyes"; then ++ AC_DEFINE(HAVE_DEV_PTS_AND_PTC) ++ fi ++ ], ++ [ ++ # Check for ptc device ++ AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC)) ++ ] ++) + + dnl Checks for header files. + # AC_HEADER_DIRENT diff --git a/packages/stunnel/stunnel-4.09/automake.patch b/packages/stunnel/stunnel-4.09/automake.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/stunnel/stunnel-4.09/configure.patch b/packages/stunnel/stunnel-4.09/configure.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/stunnel/stunnel.inc b/packages/stunnel/stunnel.inc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb index ded0f8e096..d76b68488a 100644 --- a/packages/stunnel/stunnel_4.05.bb +++ b/packages/stunnel/stunnel_4.05.bb @@ -1,29 +1,8 @@ -SECTION = "console/network" -DEPENDS = "openssl" -HOMEPAGE = "http://www.stunnel.org" -LICENSE = "GPL" -DESCRIPTION = "Stunnel is a program that allows you to encrypt \ -arbitrary TCP connections inside SSL" -PR = "r1" +include stunnel.inc -SRC_URI = "http://www.stunnel.org/download/stunnel/src/stunnel-${PV}.tar.gz \ +PR = "r1" +SRC_URI = "ftp://stunnel.mirt.net/stunnel/OBSOLETE/stunnel-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://automake.patch;patch=1 \ file://init \ file://stunnel.conf" - -S = "${WORKDIR}/stunnel-${PV}" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "stunnel" -INITSCRIPT_PARAMS = "defaults" - -EXTRA_OECONF = "--with-ssl=${STAGING_LIBDIR}/.." - -do_install() { - autotools_do_install - install -d ${D}${sysconfdir}/stunnel ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/stunnel - install -m 644 ${WORKDIR}/stunnel.conf ${D}${sysconfdir}/stunnel -} diff --git a/packages/stunnel/stunnel_4.09.bb b/packages/stunnel/stunnel_4.09.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3