Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fcf37dabf1fa1ca9e126b935af9cdef5d4b084d7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fcf37dabf1fa1ca9e126b935af9cdef5d4b084d7)
  • Date: Mon, 3 Feb 2014 09:22:10 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/stunnel/BUILD | 23 +++++---------------
net/stunnel/CONFIGURE | 50
++++++++++++++++++++++++++-------------------
net/stunnel/DEPENDS | 7 +++++-
net/stunnel/DETAILS | 9 +++++---
net/stunnel/INSTALL | 18 +++++++++-------
net/stunnel/PRE_BUILD | 8 +++++++
net/stunnel/excluded | 1
net/stunnel/init.d/stunnel | 7 ++++++
8 files changed, 73 insertions(+), 50 deletions(-)

New commits:
commit fcf37dabf1fa1ca9e126b935af9cdef5d4b084d7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

stunnel: => 4.56

diff --git a/net/stunnel/BUILD b/net/stunnel/BUILD
index 2257fb6..6fa259a 100755
--- a/net/stunnel/BUILD
+++ b/net/stunnel/BUILD
@@ -1,25 +1,14 @@
-[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST} --build=${BUILD}"
-
-OPTS=" --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
---localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS"
-
-
-case $CERTIFICATE in
+OPTS="--with-threads=$STUNNEL_THREADS \
+ $STUNNEL_OPTS \
+ $OPTS" &&

+case "$CERTIFICATE" in
y|Y|j|J)
- ./configure $OPTS &&
- make all &&
+ default_build &&
rm -f /etc/stunnel/stunnel.pem
;;
-
*)
cp /etc/stunnel/stunnel.pem tools/ &&
- ./configure $OPTS &&
- make all
+ default_build
;;
-
esac
diff --git a/net/stunnel/CONFIGURE b/net/stunnel/CONFIGURE
index 311140a..0a899d0 100755
--- a/net/stunnel/CONFIGURE
+++ b/net/stunnel/CONFIGURE
@@ -1,52 +1,60 @@
+config_query_list STUNNEL_THREADS "Select threading model:" \
+ pthread \
+ fork \
+ ucontext &&
+
+config_query_option STUNNEL_OPTS \
+ "Enable IPv6?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
get_info_from_user()
{
-
- cat <<EOF
-You are about to be asked to enter information that will be incorporated
-into your certificate request.
+message "${MESSAGE_COLOR}
+You are about to be asked to enter information that will be incorporated into
+your certificate request.
What you are about to enter is what is called a Distinguished Name or a DN.
-There are quite a few fields but you can leave some blank
-For some fields there will be a default value,
-If you enter '.', the field will be left blank.
-EOF
+There are quite a few fields but you can leave some blank.
+For some fields there will be a default value.${DEFAULT_COLOR}\n" &&

- config_query_string COUNTRY_NAME "Country Name (2 letter code)" "PL"
+ config_query_string COUNTRY_NAME "Country Name (2 letter code)" "PL" &&

config_query_string PROVINCE_NAME \
- "State or Province Name (full name)" "Some-State"
+ "State or Province Name (full name)" "Some-State" &&

- config_query_string LOCALITY_NAME "Locality Name (eg, city)"
+ config_query_string LOCALITY_NAME "Locality Name (eg, city)" &&

config_query_string ORG_NAME \
- "Organization Name (eg, company)" "Stunnel Developers Ltd"
+ "Organization Name (eg, company)" "Stunnel Developers Ltd" &&

- config_query_string ORG_UNIT_NAME "Organizational Unit Name (eg, section)"
+ config_query_string ORG_UNIT_NAME "Organizational Unit Name (eg, section)"
&&

config_query_string COMMON_NAME \
"Common Name (FQDN of your server)" "localhost"
-
}

if [ -f /etc/stunnel.pem ] ; then
mv /etc/stunnel.pem /etc/ssl/certs/
-fi
+fi &&

# Heh
if [ -f /etc/ssl/certs/stunnel.pem ] ; then
mv /etc/ssl/certs/stunnel.pem /etc/stunnel/
-fi
+fi &&

-persistent_add CERTIFICATE
+persistent_add CERTIFICATE &&

if [ ! -f /etc/stunnel/stunnel.pem ] ; then
- get_info_from_user
+ get_info_from_user &&
+
CERTIFICATE="y"
elif [[ $CERTIFICATE == "" ]] &&
query "Generate a self signed certificate?" n ; then
- get_info_from_user
- CERTIFICATE="y"
+ get_info_from_user &&
+
+ CERTIFICATE="y"
else
CERTIFICATE="n"
-fi
+fi &&

unset get_info_from_user
diff --git a/net/stunnel/DEPENDS b/net/stunnel/DEPENDS
index a70b5cf..3541952 100755
--- a/net/stunnel/DEPENDS
+++ b/net/stunnel/DEPENDS
@@ -1 +1,6 @@
-depends openssl
+depends openssl &&
+
+optional_depends tcp_wrappers \
+ "--enable-libwrap" \
+ "--disable-libwrap" \
+ "for TCP wrappers library support"
diff --git a/net/stunnel/DETAILS b/net/stunnel/DETAILS
index 245e0ec..ee48212 100755
--- a/net/stunnel/DETAILS
+++ b/net/stunnel/DETAILS
@@ -1,19 +1,22 @@
SPELL=stunnel
- VERSION=4.55
+ VERSION=4.56
BRANCH=$(echo $VERSION | cut -d. -f1)
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.stunnel.org/stunnel/archive/$BRANCH.x/$SOURCE

SOURCE_URL[1]=http://www.usenix.org.uk/mirrors/stunnel/archive/$BRANCH.x/$SOURCE

SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/networking/stunnel/archive/$BRANCH.x/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+ SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
SOURCE_GPG="stunnel.gpg:$SOURCE2:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
+ ACTIVE_FTP=on
WEB_SITE=http://www.stunnel.org/
KEYWORDS="net"
ENTERED=20011108
- SHORT="Multiplatform SSL tunneling proxy"
+ SHORT="multiplatform SSL tunneling proxy"
cat << EOF
The stunnel program is designed to work as an SSL encryption wrapper between
remote client and local (inetd-startable) or remote server. It can be used to
diff --git a/net/stunnel/INSTALL b/net/stunnel/INSTALL
index 4caac86..bdb580c 100755
--- a/net/stunnel/INSTALL
+++ b/net/stunnel/INSTALL
@@ -1,8 +1,10 @@
-make install <<EOF
-$COUNTRY_NAME
-$PROVINCE_NAME
-$LOCALITY_NAME
-$ORG_NAME
-$ORG_UNIT_NAME
-$COMMON_NAME
-EOF
+local STUNNEL_CNF="tools/stunnel.cnf" &&
+
+sedit "s:^countryName_default.*:countryName_value = $COUNTRY_NAME:"
$STUNNEL_CNF &&
+sedit "s:^stateOrProvinceName_default.*:stateOrProvinceName_value =
$PROVINCE_NAME:" $STUNNEL_CNF &&
+sedit "s:^localityName_default.*:localityName_value = $LOCALITY_NAME:"
$STUNNEL_CNF &&
+sedit "s:^organizationName_default.*:organizationName_value = $ORG_NAME:"
$STUNNEL_CNF &&
+sedit "s:^organizationalUnitName_default.*:organizationalUnitName_value =
$ORG_UNIT_NAME:" $STUNNEL_CNF &&
+sedit "s:^0\.commonName_default.*:0\.commonName_value = $COMMON_NAME:"
$STUNNEL_CNF &&
+
+default_install
diff --git a/net/stunnel/PRE_BUILD b/net/stunnel/PRE_BUILD
new file mode 100755
index 0000000..40fdf4a
--- /dev/null
+++ b/net/stunnel/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# fixed default paths in configuration file
+sedit "s:@prefix@::g" tools/stunnel.conf-sample.in &&
+
+# fixed check for existent stunnel certificate
+sedit
"s:\$(DESTDIR)\$(confdir)/stunnel.pem:$INSTALL_ROOT/etc/stunnel/stunnel.pem:"
tools/Makefile.in
diff --git a/net/stunnel/excluded b/net/stunnel/excluded
new file mode 100644
index 0000000..21f41f2
--- /dev/null
+++ b/net/stunnel/excluded
@@ -0,0 +1 @@
+^/etc/stunnel/stunnel\.pem
diff --git a/net/stunnel/init.d/stunnel b/net/stunnel/init.d/stunnel
new file mode 100755
index 0000000..c23f066
--- /dev/null
+++ b/net/stunnel/init.d/stunnel
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/stunnel
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init




Archive powered by MHonArc 2.6.24.

Top of Page