[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (10a41f69a9a5acf52b27a80906db61a91f87b97b)

Vlad Glagolev scm at sourcemage.org
Sat Dec 18 19:42:23 EST 2010


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

 ChangeLog               |    3 ++
 database/tdb/DEPENDS    |    6 +++++
 database/tdb/DETAILS    |   20 +++++++++++++++++
 database/tdb/HISTORY    |   55 ++++++++++++++++++++++++++++++++++++++++++++++++
 database/tdb/PRE_BUILD  |    4 +++
 database/tdb/jelmer.gpg |binary
 libs/tdb/DEPENDS        |    1 
 libs/tdb/DETAILS        |   18 ---------------
 libs/tdb/HISTORY        |   48 -----------------------------------------
 libs/tdb/PRE_BUILD      |    3 --
 mail/exim/BUILD         |    1 
 mail/exim/HISTORY       |    4 +++
 mail/exim/init.d/exim   |   10 +++++---
 13 files changed, 99 insertions(+), 74 deletions(-)

New commits:
commit 10a41f69a9a5acf52b27a80906db61a91f87b97b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    exim: properly handle pidfile

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

    tdb: moved from libs to database section

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

    tdb: => 1.2.7

diff --git a/ChangeLog b/ChangeLog
index d77176f..aec921d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* database/tdb: moved from libs
+
 2010-12-18 Vlad Glagolev <stealth at sourcemage.org>
 	* net/flow-tools: new spell, library and tools to collect and store
 	  NetFlow data
diff --git a/database/tdb/DEPENDS b/database/tdb/DEPENDS
new file mode 100755
index 0000000..391273a
--- /dev/null
+++ b/database/tdb/DEPENDS
@@ -0,0 +1,6 @@
+depends libxslt &&
+
+optional_depends python \
+                 "--enable-python" \
+                 "--disable-python" \
+                 "for Python binding"
diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
new file mode 100755
index 0000000..d85605f
--- /dev/null
+++ b/database/tdb/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=tdb
+         VERSION=1.2.7
+          SOURCE=${SPELL}-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://samba.org/ftp/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=jelmer.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+      LICENSE[0]=GPL
+        WEB_SITE=http://tdb.samba.org/
+         ENTERED=20020210
+        KEYWORDS="database libs"
+           SHORT="Trivial Database"
+cat << EOF
+TDB is a Trivial Database. In concept, it is very much like GDBM,
+and BSD's DB except that it allows multiple simultaneous writers
+and uses locking internally to keep writers from trampling on each
+other. TDB is also extremely small.
+EOF
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
new file mode 100644
index 0000000..28a25fd
--- /dev/null
+++ b/database/tdb/HISTORY
@@ -0,0 +1,55 @@
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.2.7; switched to upstream key management;
+	  updated urls
+	* DEPENDS: added optional python dependency; removed gdbm - not needed;
+	  libxslt is needed to build docs
+	* PRE_BUILD: removed _PUBLIC_ defs (already fixed in git by upstream)
+	* jelmer.gpg: added
+
+2010-10-06 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.2.2
+	  new URL
+	* PRE_BUILD: added
+
+2009-01-23 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to tdb_1.1.2~git20081222
+	  Stable hasn't been updated since 2001
+	* BUILD: Removed, no more patches
+	* config.db.patch, tdb.patch: Removed, applied upstream
+
+2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: [automated] Removed BUILD_API=2.
+
+2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2005-11-29 Seth Woolley <seth at tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2005-09-24 George Sherwood <george at beernabeer.com>
+	* DETAILS,BUILD: Update for BUILD_API=2
+
+2005-05-11 Seth Woolley <seth at tautology.org>
+	* BUILD,config.sub.patch: edit/add for x86_64 support
+
+2004-05-24 Treeve Jelbert <treeve at sourcemage.org>
+	* BUILD: fix man pages
+	  use default_build - clean up script
+
+2003-07-16 Eric Sandall <sandalle at sourcemage.org>
+	* Now compiles (Bug #3762) Thanks to Chris Dennis
+
+2003-05-20 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS to fix my broken SOURCEFORGE_URL fixes
+
+2003-05-18 Seth Woolley <seth at tautology.org>
+	* Modified DETAILS for SOURCEFORGE_URL fix
+
+2002-10-31 Julian v. Bock <julian at wongr.net>
+	* DEPENDS: add; add gdbm dep.
+
+2002-10-14 Julian v. Bock <julian at wongr.net>
+	* DETAILS: add LICENSE and MD5 fields.
diff --git a/database/tdb/PRE_BUILD b/database/tdb/PRE_BUILD
new file mode 100755
index 0000000..cd86e14
--- /dev/null
+++ b/database/tdb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i "s:_PUBLIC_ ::g" include/tdb.h
diff --git a/database/tdb/jelmer.gpg b/database/tdb/jelmer.gpg
new file mode 100644
index 0000000..af7063b
Binary files /dev/null and b/database/tdb/jelmer.gpg differ
diff --git a/libs/tdb/DEPENDS b/libs/tdb/DEPENDS
deleted file mode 100755
index d0ce64e..0000000
--- a/libs/tdb/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  gdbm
diff --git a/libs/tdb/DETAILS b/libs/tdb/DETAILS
deleted file mode 100755
index c7a3687..0000000
--- a/libs/tdb/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=tdb
-         VERSION=1.2.2
-     SOURCE_HASH=sha512:65f587e847c9a1f03aafe1cd903fea0a1271460b022ad60cdf24e39b3a9ce681420c872b7c4ab86ed00ffe3d50f14bfcda6fef978c2026d4a7f518117b6848db
-          SOURCE=${SPELL}-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://samba.org/ftp/tdb/$SOURCE
-#      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-      LICENSE[0]=GPL
-        WEB_SITE=http://sourceforge.net/projects/tdb
-         ENTERED=20020210
-        KEYWORDS="database libs"
-           SHORT="Trivial Database"
-cat << EOF
-TDB is a Trivial Database. In concept, it is very much like GDBM,
-and BSD's DB except that it allows multiple simultaneous writers
-and uses locking internally to keep writers from trampling on each
-other. TDB is also extremely small.
-EOF
diff --git a/libs/tdb/HISTORY b/libs/tdb/HISTORY
deleted file mode 100644
index 5a63bb3..0000000
--- a/libs/tdb/HISTORY
+++ /dev/null
@@ -1,48 +0,0 @@
-2010-10-06 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.2.2
-	  new URL
-	* PRE_BUILD: added
-
-2009-01-23 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to tdb_1.1.2~git20081222
-	  Stable hasn't been updated since 2001
-	* BUILD: Removed, no more patches
-	* config.db.patch, tdb.patch: Removed, applied upstream
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-09-24 George Sherwood <george at beernabeer.com>
-	* DETAILS,BUILD: Update for BUILD_API=2
-
-2005-05-11 Seth Woolley <seth at tautology.org>
-	* BUILD,config.sub.patch: edit/add for x86_64 support
-
-2004-05-24 Treeve Jelbert <treeve at sourcemage.org>
-	* BUILD: fix man pages
-	  use default_build - clean up script
-
-2003-07-16 Eric Sandall <sandalle at sourcemage.org>
-	* Now compiles (Bug #3762) Thanks to Chris Dennis
-
-2003-05-20 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS to fix my broken SOURCEFORGE_URL fixes
-
-2003-05-18 Seth Woolley <seth at tautology.org>
-	* Modified DETAILS for SOURCEFORGE_URL fix
-
-2002-10-31 Julian v. Bock <julian at wongr.net>
-	* DEPENDS: add; add gdbm dep.
-
-2002-10-14 Julian v. Bock <julian at wongr.net>
-	* DETAILS: add LICENSE and MD5 fields.
-
diff --git a/libs/tdb/PRE_BUILD b/libs/tdb/PRE_BUILD
deleted file mode 100755
index 821d675..0000000
--- a/libs/tdb/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-./autogen.sh
diff --git a/mail/exim/BUILD b/mail/exim/BUILD
index 7effd7e..afbabb3 100755
--- a/mail/exim/BUILD
+++ b/mail/exim/BUILD
@@ -181,6 +181,7 @@ fi  &&
 echo  "BIN_DIRECTORY=/usr/sbin"          >>  Local/Makefile  &&
 echo  "CONFIGURE_FILE=/etc/exim.conf"    >>  Local/Makefile  &&
 echo  "SPOOL_DIRECTORY=/var/spool/mail"  >>  Local/Makefile  &&
+echo  "PID_FILE_PATH=/var/run/exim.pid"  >>  Local/Makefile  &&
 echo  "LOG_FILE_PATH=/var/log/exim_%s:"  >>  Local/Makefile  &&
 echo  "CFLAGS=$CFLAGS"                   >>  Local/Makefile  &&
 echo  "EXIM_UID=`id -u exim`"            >>  Local/Makefile  &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index d3f5b13..7f2c688 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,7 @@
+2010-12-19 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: use proper pid file path
+	* init.d/exim: use PIDFILE
+
 2010-10-19 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 4.72
 	  SECURITY_PATCH++
diff --git a/mail/exim/init.d/exim b/mail/exim/init.d/exim
index 3bcb41b..386dc48 100644
--- a/mail/exim/init.d/exim
+++ b/mail/exim/init.d/exim
@@ -1,12 +1,14 @@
 #!/bin/bash
-PROGRAM=/usr/sbin/exim
-RUNLEVEL=3
-NEEDS="+network"
 
 #
 # /etc/sysconfig/exim needs to be sourced before ARGS
 #
 . /etc/sysconfig/exim
-. /etc/init.d/smgl_init
 
+PROGRAM=/usr/sbin/exim
 ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/exim.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init



More information about the SM-Commit mailing list