[SM-Commit] GIT changes to master grimoire by Andraž Levstik (3c7259028f9575b0b1706a13b3f7089097f6736f)

Andraž Levstik scm at sourcemage.org
Wed Oct 31 10:08:28 EDT 2007


GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 mail/alpine/BUILD   |   13 +------------
 mail/alpine/DEPENDS |   21 +++++++++++++++------
 mail/alpine/HISTORY |    4 ++++
 net/tor/DETAILS     |   10 +++++-----
 net/tor/HISTORY     |    5 +++++
 5 files changed, 30 insertions(+), 23 deletions(-)

New commits:
commit 05c3de84721eca1dd841f71c707d6392e0073f86
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    tor: update devel and stable

commit 4864ea80b4e67b0db6f35e850906904fa4cc417a
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    alpine: minor cleanup of BUILD and moving stuff to DEPENDS

diff --git a/mail/alpine/BUILD b/mail/alpine/BUILD
index 9447ed2..6ddf11b 100755
--- a/mail/alpine/BUILD
+++ b/mail/alpine/BUILD
@@ -1,13 +1,2 @@
-if echo $OPTS | grep -q with-ssl; then
-  message "${MESSAGE_COLOR}Building with OpenSSL...${DEFAULT_COLOR}" &&
-  ALPINE_OPTS="${ALPINE_OPTS}                                        \
-           --with-ssl-dir=$INSTALL_ROOT/usr                          \
-           --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs          \
-           --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl  \
-           --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib"
-else
-  message "${MESSAGE_COLOR}Building without OpenSSL...${DEFAULT_COLOR}"
-fi &&
-
-OPTS="${OPTS} --with-system-pinerc=/etc/pinerc --with-c-client-target=slx ${ALPINE_OPTS}" &&
+OPTS="--with-system-pinerc=/etc/pinerc --with-c-client-target=slx ${ALPINE_OPTS} $OPTS" &&
 default_build
diff --git a/mail/alpine/DEPENDS b/mail/alpine/DEPENDS
index 7c15b66..9840edd 100755
--- a/mail/alpine/DEPENDS
+++ b/mail/alpine/DEPENDS
@@ -1,14 +1,23 @@
 depends MAIL-TRANSPORT-AGENT &&
 
-optional_depends openssl '--with-ssl-dir' '--without-ssl'                    \
-                         'for SSL/TLS support'                               &&
+optional_depends openssl                                                  \
+                 "--with-ssl-dir=$INSTALL_ROOT/usr                        \
+                 --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs         \
+                 --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl \
+                 --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib"                \
+                 "--without-ssl"                                          \
+                 "for SSL/TLS support"                                   &&
 
 # it doesn't detect TCL as much as i have tried
 #optional_depends tcl '--with-tcl-lib'  '--without-tcl'                       \
 #                     'for Web Alpine support'                                &&
 
-optional_depends openldap '--with-ldap-dir' '--without-ldap'                 \
-                          'for LDAP support'                                 &&
+optional_depends openldap                                                 \
+                 '--with-ldap-dir'                                        \
+                 '--without-ldap'                                         \
+                 'for LDAP support'                                      &&
 
-optional_depends krb5 '--with-krb5-dir' '--without-krb5'                     \
-                      'for Kerberos support'
+optional_depends krb5                                                     \
+                 '--with-krb5-dir'                                        \
+                 '--without-krb5'                                         \
+                 'for Kerberos support'
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index 147ac10..fcb1820 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,2 +1,6 @@
+2007-10-31 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* BUILD: removed the unnecessary ssl stuff
+	* DEPENDS: added more opts to the ssl stuff
+
 2007-10-30 Elisamuel Resto <ryuji at mages.ath.cx>
 	* BUILD, CONFIGURE, DEPENDS, DETAILS: spell created from current c-client spell.
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index f743fd5..79da9c0 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,19 +1,19 @@
            SPELL=tor
 
 if [ "$TOR_DEVEL" == "y" ]; then
-         VERSION=0.2.0.6-alpha
+         VERSION=0.2.0.9-alpha
   SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
+   SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
          SOURCE2=$SOURCE.asc
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
       SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 else
-         VERSION=0.1.2.17
+         VERSION=0.1.2.18
   SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://tor.eff.org/dist/$SOURCE
+   SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
          SOURCE2=$SOURCE.asc
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
       SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
@@ -22,7 +22,7 @@ fi
 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=BSD
-        WEB_SITE=http://tor.eff.org/
+        WEB_SITE=http://www.torproject.org/
          ENTERED=20050415
         KEYWORDS="net"
            SHORT="An anonymous Internet communication system"
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index c2111f3..88e2d34 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,8 @@
+2007-10-31 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: updated TOR_DEVEL=n to 0.1.2.18
+	  updated TOR_DEVEL=y to 0.2.0.9-alpha
+	  URLS are now torproject
+
 2007-09-01 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated TOR_DEVEL=y to 0.2.0.6-alpha
 	  SECURITY_PATCH++



More information about the SM-Commit mailing list