Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (2f73bb212292a590299ffd4c11a94279b1643719)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (2f73bb212292a590299ffd4c11a94279b1643719)
  • Date: Tue, 12 Oct 2010 05:35:47 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 4 ++++
net/conntrack/BUILD | 4 +++-
net/conntrack/DETAILS | 25 +++++++++++++++++++------
net/conntrack/DOWNLOAD | 16 ----------------
net/conntrack/HISTORY | 8 ++++++++
net/conntrack/PREPARE | 8 +++++++-
net/libnetfilter_conntrack/BUILD | 4 +++-
net/libnetfilter_conntrack/DETAILS | 24 ++++++++++++++++++------
net/libnetfilter_conntrack/DOWNLOAD | 16 ----------------
net/libnetfilter_conntrack/HISTORY | 8 ++++++++
net/libnetfilter_conntrack/PREPARE | 8 +++++++-
net/libnfnetlink/BUILD | 4 +++-
net/libnfnetlink/DETAILS | 25 +++++++++++++++++++------
net/libnfnetlink/DOWNLOAD | 16 ----------------
net/libnfnetlink/HISTORY | 8 ++++++++
net/libnfnetlink/PREPARE | 8 +++++++-
net/netfilter.gpg |binary
17 files changed, 114 insertions(+), 72 deletions(-)

New commits:
commit 2f73bb212292a590299ffd4c11a94279b1643719
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libnfnetlink: added versioned source, version 1.0.0

commit 947c044ab3a965ddc38701373cf3ac8709a2f1a3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libnetfilter_conntrack: added versioned source, version 0.9.0

commit 2c5a236edd331fd2fdf1bb1d59752567b2f024bb
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

conntrack: added versioned source, version 0.9.14

commit 2a6a1f2976a4a813ae6908e5543dcfcbd54a3077
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

net/netfilter.gpg: added gpg keyring with key 2D0987E6

Keyring for spells libnetfilter_conntrack, libnfnetlink & conntrack

commit d653ade5734bc07fe9608b8c61ab904249874123
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libnfnetlink: git is used now

commit c6e06e0894f643940178bfdd971d2a9a082216d4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libnetfilter_conntrack: git is used now

commit 8e3e822b4a07772cc714ebc0fc49a71c2908766e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

conntrack: git is used now

diff --git a/ChangeLog b/ChangeLog
index 1bc9558..7965dab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-12 Bor Kraljič <pyrobor AT ver.si>
+ * net/netfilter.gpg: added 2D0987E6 (Netfilter Core Team
<coreteam AT netfilter.org>)
+ from http://www.netfilter.org/files/coreteam-gpg-key-2D0987E6.txt
+
2010-10-11 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-apps/wicd-client-kde: new spell - kde4 gui for wicd

diff --git a/net/conntrack/BUILD b/net/conntrack/BUILD
index 22cec4e..04cd127 100755
--- a/net/conntrack/BUILD
+++ b/net/conntrack/BUILD
@@ -1,2 +1,4 @@
-./autogen.sh &&
+if [[ "$CONNTRACK_GIT" == "y" ]]; then
+./autogen.sh
+fi &&
default_build
diff --git a/net/conntrack/DETAILS b/net/conntrack/DETAILS
index 1498f6e..83d7239 100755
--- a/net/conntrack/DETAILS
+++ b/net/conntrack/DETAILS
@@ -1,14 +1,27 @@
SPELL=conntrack
-if [[ "$CONNTRACK_SVN_AUTOUPDATE" == "y" ]]; then
+ SPELLX=conntrack-tools
+if [[ "$CONNTRACK_GIT" == "y" ]]; then
+if [[ "$CONNTRACK_GIT_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_IGNORE=volatile
- NFT_SVN='https://svn.netfilter.org/netfilter/trunk/conntrack/'
- WEBSITE=http://www.netfilter.org
+ SOURCE_URL[0]="git://git.netfilter.org/conntrack-tools.git:$SPELL-git"
+ FORCE_DOWNLOAD=1
+else
+ VERSION=0.9.14
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/$SPELLX/files/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=netfilter.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+fi
+ WEB_SITE=http://conntrack-tools.netfilter.org/
ENTERED=20060413
LICENSE[0]=GPL
SHORT="netfilter conntrack"
diff --git a/net/conntrack/DOWNLOAD b/net/conntrack/DOWNLOAD
deleted file mode 100755
index 2326934..0000000
--- a/net/conntrack/DOWNLOAD
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f $SOURCE_CACHE/$SOURCE ] ; then
- rm $SOURCE_CACHE/$SOURCE
-fi
-
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
-
-svn export $NFT_SVN $SPELL &&
-mv $SPELL $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-
diff --git a/net/conntrack/HISTORY b/net/conntrack/HISTORY
index 891ce61..0a3a134 100644
--- a/net/conntrack/HISTORY
+++ b/net/conntrack/HISTORY
@@ -1,3 +1,11 @@
+2010-10-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: git is used now
+ added versioned source, version 0.9.14
+ converted to upstream signature checking
+ * PREPARE: added query for versioned build
+ * BUILD: do ./autogen.sh only for git versions
+ * DOWNLOAD: removed, no longer needed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/conntrack/PREPARE b/net/conntrack/PREPARE
index ba887df..92cb046 100755
--- a/net/conntrack/PREPARE
+++ b/net/conntrack/PREPARE
@@ -1 +1,7 @@
-config_query CONNTRACK_SVN_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
+config_query CONNTRACK_GIT "Build the git version?" n
+
+if [[ "$CONNTRACK_GIT" == "y" ]]
+then
+ config_query CONNTRACK_GIT_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/net/libnetfilter_conntrack/BUILD
b/net/libnetfilter_conntrack/BUILD
index 22cec4e..dba715f 100755
--- a/net/libnetfilter_conntrack/BUILD
+++ b/net/libnetfilter_conntrack/BUILD
@@ -1,2 +1,4 @@
-./autogen.sh &&
+if [[ "$LIBNETFILTER_CONNTRACK_GIT" == "y" ]]; then
+./autogen.sh
+fi &&
default_build
diff --git a/net/libnetfilter_conntrack/DETAILS
b/net/libnetfilter_conntrack/DETAILS
index 72dbf2e..c0dc9a6 100755
--- a/net/libnetfilter_conntrack/DETAILS
+++ b/net/libnetfilter_conntrack/DETAILS
@@ -1,14 +1,26 @@
SPELL=libnetfilter_conntrack
-if [[ "$LIBNETFILTER_CONNTRACK_SVN_AUTOUPDATE" == "y" ]]; then
+if [[ "$LIBNETFILTER_CONNTRACK_GIT" == "y" ]]; then
+if [[ "$LIBNETFILTER_CONNTRACK_GIT_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_IGNORE=volatile
-
NFT_SVN='https://svn.netfilter.org/netfilter/trunk/libnetfilter_conntrack/'
- WEBSITE=http://www.netfilter.org
+
SOURCE_URL[0]="git://git.netfilter.org/libnetfilter_conntrack.git:$SPELL-git"
+ FORCE_DOWNLOAD=1
+else
+ VERSION=0.9.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/$SPELL/files/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=netfilter.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+fi
+ WEB_SITE=http://www.netfilter.org
ENTERED=20060413
LICENSE[0]=GPL
SHORT="netfilter libnetfilter_conntrack"
diff --git a/net/libnetfilter_conntrack/DOWNLOAD
b/net/libnetfilter_conntrack/DOWNLOAD
deleted file mode 100755
index 2326934..0000000
--- a/net/libnetfilter_conntrack/DOWNLOAD
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f $SOURCE_CACHE/$SOURCE ] ; then
- rm $SOURCE_CACHE/$SOURCE
-fi
-
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
-
-svn export $NFT_SVN $SPELL &&
-mv $SPELL $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-
diff --git a/net/libnetfilter_conntrack/HISTORY
b/net/libnetfilter_conntrack/HISTORY
index 891ce61..ababf76 100644
--- a/net/libnetfilter_conntrack/HISTORY
+++ b/net/libnetfilter_conntrack/HISTORY
@@ -1,3 +1,11 @@
+2010-10-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: git is used now
+ added versioned source, version 0.9.0
+ converted to upstream signature checking
+ * PREPARE: added query for versioned build
+ * BUILD: do ./autogen.sh only for git versions
+ * DOWNLOAD: removed, no longer needed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/libnetfilter_conntrack/PREPARE
b/net/libnetfilter_conntrack/PREPARE
index d4b12dc..58e5ec5 100755
--- a/net/libnetfilter_conntrack/PREPARE
+++ b/net/libnetfilter_conntrack/PREPARE
@@ -1 +1,7 @@
-config_query LIBNETFILTER_CONNTRACK_SVN_AUTOUPDATE "Automatically update
$SPELL on system-update?" n
+config_query LIBNETFILTER_CONNTRACK_GIT "Build the git version?" n
+
+if [[ "$LIBNETFILTER_CONNTRACK_GIT" == "y" ]]
+then
+ config_query LIBNETFILTER_CONNTRACK_GIT_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/net/libnfnetlink/BUILD b/net/libnfnetlink/BUILD
index 22cec4e..a6d37da 100755
--- a/net/libnfnetlink/BUILD
+++ b/net/libnfnetlink/BUILD
@@ -1,2 +1,4 @@
-./autogen.sh &&
+if [[ "$LIBNFNETLINK_GIT" == "y" ]]; then
+./autogen.sh
+fi &&
default_build
diff --git a/net/libnfnetlink/DETAILS b/net/libnfnetlink/DETAILS
index c3ec245..5629cfc 100755
--- a/net/libnfnetlink/DETAILS
+++ b/net/libnfnetlink/DETAILS
@@ -1,14 +1,27 @@
SPELL=libnfnetlink
-if [[ "$LIBNFNETLINK_SVN_AUTOUPDATE" == "y" ]]; then
+
+if [[ "$LIBNFNETLINK_GIT" == "y" ]]; then
+if [[ "$LIBNFNETLINK_GIT_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_IGNORE=volatile
- NFT_SVN='https://svn.netfilter.org/netfilter/trunk/libnfnetlink/'
- WEBSITE=http://www.netfilter.org
+ SOURCE_URL[0]=git://git.netfilter.org/libnfnetlink.git:$SPELL-git
+ FORCE_DOWNLOAD=1
+else
+ VERSION=1.0.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/$SPELL/files/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=netfilter.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+fi
+ WEB_SITE=http://www.netfilter.org
ENTERED=20060413
LICENSE[0]=GPL
SHORT="netfilter libnfnetlink"
diff --git a/net/libnfnetlink/DOWNLOAD b/net/libnfnetlink/DOWNLOAD
deleted file mode 100755
index 2326934..0000000
--- a/net/libnfnetlink/DOWNLOAD
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f $SOURCE_CACHE/$SOURCE ] ; then
- rm $SOURCE_CACHE/$SOURCE
-fi
-
-message "${MESSAGE_COLOR}Starting SVN checkout of"
\
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
-
-svn export $NFT_SVN $SPELL &&
-mv $SPELL $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-
diff --git a/net/libnfnetlink/HISTORY b/net/libnfnetlink/HISTORY
index 7c29d15..b05c122 100644
--- a/net/libnfnetlink/HISTORY
+++ b/net/libnfnetlink/HISTORY
@@ -1,3 +1,11 @@
+2010-10-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: git is used now
+ added versioned source, version 1.0.0
+ converted to upstream signature checking
+ * PREPARE: added query for versioned build
+ * BUILD: do ./autogen.sh only for git versions
+ * DOWNLOAD: removed, no longer needed
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/net/libnfnetlink/PREPARE b/net/libnfnetlink/PREPARE
index de561ce..dc51422 100755
--- a/net/libnfnetlink/PREPARE
+++ b/net/libnfnetlink/PREPARE
@@ -1 +1,7 @@
-config_query LIBNFNETLINK_SVN_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
+config_query LIBNFNETLINK_GIT "Build the git version?" n
+
+if [[ "$LIBNFNETLINK_GIT" == "y" ]]
+then
+ config_query LIBNFNETLINK_GIT_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/net/netfilter.gpg b/net/netfilter.gpg
new file mode 100644
index 0000000..f3483f1
Binary files /dev/null and b/net/netfilter.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (2f73bb212292a590299ffd4c11a94279b1643719), Bor Kraljič, 10/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page