[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (51098d6443286a16da4bb1f65ce35c2210ca92d1)

Vlad Glagolev scm at sourcemage.org
Fri Apr 2 09:20:22 EDT 2010


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

 ChangeLog           |    3 +++
 net/libpcap/BUILD   |    3 ---
 net/libpcap/DETAILS |    4 ++--
 net/libpcap/HISTORY |    4 ++++
 net/tcpdump.gpg     |binary
 net/tcpdump/BUILD   |    1 -
 net/tcpdump/DEPENDS |    7 ++++++-
 net/tcpdump/DETAILS |    4 ++--
 net/tcpdump/HISTORY |    5 +++++
 9 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit 51098d6443286a16da4bb1f65ce35c2210ca92d1
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    tcpdump: => 4.1.0

commit 40b15e8a430444535d2da23b316b2080a62a56a3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libpcap: => 1.1.0

commit 9a776c56672fb40e693460e3bbfe37fd246a5f36
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    net/tcpdump.gpg: added key E99DD5FD (Michael Richardson <mcr at credil.org>)

diff --git a/ChangeLog b/ChangeLog
index dbf0b07..df890d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-02 Vlad Glagolev <stealth at sourcemage.org>
+	* net/tcpdump.gpg: added key E99DD5FD (Michael Richardson <mcr at credil.org>)
+
 2010-04-02 Philippe 'Puppet_Master' Caseiro <puppetmaster at sourcemage.org>
 	* database/mariadb: new spell, mysql fork
 
diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
deleted file mode 100755
index aefe3a1..0000000
--- a/net/libpcap/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-sed -i "s:\-O2::" configure &&
-
-default_build
diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index a58c4d2..149b055 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libpcap
-         VERSION=1.0.0
+         VERSION=1.1.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%.*}"
    SOURCE_URL[0]=http://www.tcpdump.org/release/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sig
         WEB_SITE=http://www.tcpdump.org/
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 58eda94..aa664b0 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.1.0; corrected source dir
+	* BUILD: removed
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.0.0
 	* BUILD: cleaned up
diff --git a/net/tcpdump.gpg b/net/tcpdump.gpg
index cba675a..a46060c 100644
Binary files a/net/tcpdump.gpg and b/net/tcpdump.gpg differ
diff --git a/net/tcpdump/BUILD b/net/tcpdump/BUILD
index 20e9f38..f21fb9d 100755
--- a/net/tcpdump/BUILD
+++ b/net/tcpdump/BUILD
@@ -1,4 +1,3 @@
-CFLAGS="$( sed 's/-O3//' <<< $CFLAGS )" &&
 OPTS="--enable-ipv6 $OPTS" &&
 
 default_build
diff --git a/net/tcpdump/DEPENDS b/net/tcpdump/DEPENDS
index a8ec60d..8abeac7 100755
--- a/net/tcpdump/DEPENDS
+++ b/net/tcpdump/DEPENDS
@@ -1 +1,6 @@
-depends libpcap
+depends libpcap &&
+
+optional_depends openssl \
+                 "--with-crypto" \
+                 "--without-crypto" \
+                 "for SSL support"
diff --git a/net/tcpdump/DETAILS b/net/tcpdump/DETAILS
index 800dbe2..58ab7ec 100755
--- a/net/tcpdump/DETAILS
+++ b/net/tcpdump/DETAILS
@@ -1,8 +1,8 @@
            SPELL=tcpdump
-         VERSION=4.0.0
+         VERSION=4.1.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%.*}"
    SOURCE_URL[0]=http://www.tcpdump.org/release/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sig
       SOURCE_GPG=tcpdump.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index 1bb21c9..1c78404 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,8 @@
+2010-04-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 4.1.0; corrected source dir
+	* DEPENDS: added openssl as opt dep
+	* BUILD: removed useless hacks
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.0.0
 



More information about the SM-Commit mailing list