sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (792dcfa0f00760bf6d098de6c6f07c94688d608c)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (792dcfa0f00760bf6d098de6c6f07c94688d608c)
- Date: Mon, 10 Dec 2012 12:38:25 -0600
GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
ChangeLog
| 4 +
database/pgadmin3/DETAILS
| 2
database/pgadmin3/HISTORY
| 3
devel/nasm/DETAILS
| 4 -
devel/nasm/HISTORY
| 3
libs/libircclient/0001-fix-install-target-build-shared-and-static-library.patch
| 32 ++++++++++
libs/libircclient/BUILD
| 2
libs/libircclient/DEPENDS
| 4 +
libs/libircclient/DETAILS
| 16 +++++
libs/libircclient/HISTORY
| 6 +
libs/libircclient/PRE_BUILD
| 3
libs/miniupnpc/BUILD
| 1
libs/miniupnpc/DETAILS
| 15 ++++
libs/miniupnpc/HISTORY
| 3
libs/miniupnpc/INSTALL
| 3
libs/pyqt4/DETAILS
| 4 -
libs/pyqt4/HISTORY
| 3
libs/sip/DETAILS
| 4 -
libs/sip/HISTORY
| 3
mail/courier/CONFLICTS
| 1
mail/courier/HISTORY
| 3
mail/esmtp/CONFLICTS
| 1
mail/esmtp/HISTORY
| 3
mail/exim/CONFLICTS
| 1
mail/exim/HISTORY
| 3
mail/masqmail/CONFLICTS
| 1
mail/masqmail/HISTORY
| 3
mail/msmtp/CONFIGURE
| 4 -
mail/msmtp/CONFLICTS
| 7 ++
mail/msmtp/DETAILS
| 6 -
mail/msmtp/HISTORY
| 6 +
mail/msmtp/INSTALL
| 8 ++
mail/msmtp/PROVIDES
| 1
mail/postfix/CONFLICTS
| 3
mail/postfix/HISTORY
| 3
mail/sendmail/CONFLICTS
| 1
mail/sendmail/HISTORY
| 3
net/samba/DETAILS
| 4 -
net/samba/HISTORY
| 3
python-pypi/alembic/DETAILS
| 4 -
python-pypi/alembic/HISTORY
| 3
security/fwknop/BUILD
| 3
security/fwknop/DETAILS
| 2
security/fwknop/HISTORY
| 5 +
security/fwknop/PRE_BUILD
| 5 -
security/fwknop/command.patch
| 14 ----
security/fwknop/digest.patch
| 27 --------
utils/xen/DEPENDS
| 2
utils/xen/HISTORY
| 3
video/smplayer/DETAILS
| 4 -
video/smplayer/HISTORY
| 3
51 files changed, 191 insertions(+), 64 deletions(-)
New commits:
commit 8d74d3b15c1e7db7eb2ee13b099b7b3b1bc971e5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pgadmin3 1.16.1
commit 140f49870e6053932528da409fd7958f0d6d35ed
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
samba 3.6.10
commit 3ca9536560f34c187ded7a28ba70f415242da659
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
smplayer 0.8.2
commit 730a8ab5ccd18bd7a0a4beb0a27c8cc48024a2da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
nasm: => 2.10.06
commit 589f672f553370b466da12c6d8e2fb9d72522b8e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pyqt4 4.9.6
commit b32678fd178e1e391ef767a527fe7a332b46fd2b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
sip 4.14.2
commit 2bdbb38cc81280c720bc7d8297ae9684f459e6d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fwknop: => 2.0.4
commit 4b0de818a88aa5ea1ea4bfdaa744363178a69d44
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
alembic: => 0.4.1
commit 8e4688075354f5d037ef4fa6718761c39659de5d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libircclient: build static and shared library, install both
commit 6565332f4acff16b824e8f823403fcd97c6c2949
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/miniupnpc: new spell, client library for upnp
commit c0a71631339423d14c05e4836f7d646f10db4b2f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libircclient: fix messed up fields in DETAILS
commit b6ec06dfbb14afef693e3fa067f770bf2431d5f3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libircclient: new spell, a library for developing IRC clients
commit aa9705d2d012aac48374e121735098febe210a6a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: added gnutls optional dependency
commit f5359312d886108910e34c88e27bf8717038a01e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
exim: added msmtp to conflicts
commit 1e5b688b3f23391ba7d53df14a37999dacc3dc55
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
courier: added msmtp to conflicts
commit 0b9e1bdd3052b66b736c7ac66253ca064d98f60c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
esmtp: added msmtp to conflicts
commit 42cca3ff4ade6df7896bc1783d346c704e856d02
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postfix: added msmtp, esmtp, courier to conflicts
commit 0445204d16ddb954a2ea34f75af90237b158f02b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sendmail: added msmtp to conflicts
commit ccf369ec78bb6e98c936a1c2eff810f4376dd0f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
masqmail: added msmtp to conflicts
commit 12fd8a842d933ad0c14765e626f06670749e7a2b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
msmtp: added sendmail symlinks
commit 1e8654371075a3e3caceb0338f3b8e7d01e255f2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
msmtp: => 1.4.30
diff --git a/ChangeLog b/ChangeLog
index cce9ef3..6caf44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libircclient: new spell, a library for developing IRC clients
+ * libs/miniupnpc: new spell, client library for upnp
+
2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
* libs/libqrencode: new spell, QR Code encoding library
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index b15cdfd..0dac9b8 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
SPELL=pgadmin3
- VERSION=1.16.0
+ VERSION=1.16.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index c33aaa2..04fbb5b 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.16.1
+
2012-09-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.16.0
diff --git a/devel/nasm/DETAILS b/devel/nasm/DETAILS
index 5f3bb9e..1ffb941 100755
--- a/devel/nasm/DETAILS
+++ b/devel/nasm/DETAILS
@@ -1,6 +1,6 @@
SPELL=nasm
- VERSION=2.10.05
-
SOURCE_HASH=sha512:0a0a8752dcea6b1d205c265f72d7bbd56c90f8ea1438af3839696d21523cda7ac98441ad148c3ca0f0f3b18d83c989213d6e4366cf479b300749879e0c0fcbf0
+ VERSION=2.10.06
+
SOURCE_HASH=sha512:e6c7fd9a2c547b22174b26ae3c930e7608348b20021e06e93d0729374b2bc50b4c2dec3775fb1e0179a172837ff7b1e7fdb53cb393df021e052282dc1d03100c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.nasm.us/pub/nasm/releasebuilds/$VERSION/$SOURCE
diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index 8ca664b..1da26cc 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.10.06
+
2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10.05
diff --git
a/libs/libircclient/0001-fix-install-target-build-shared-and-static-library.patch
b/libs/libircclient/0001-fix-install-target-build-shared-and-static-library.patch
new file mode 100644
index 0000000..401939c
--- /dev/null
+++
b/libs/libircclient/0001-fix-install-target-build-shared-and-static-library.patch
@@ -0,0 +1,32 @@
+From 7ada7d12db384f096c3abe74f4fc25dbe89893b5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 9 Dec 2012 15:36:08 +0100
+Subject: [PATCH] fix install target, build shared and static library
+
+---
+ src/Makefile.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 752d627..86b8a7a 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -8,12 +8,14 @@ DESTDIR=
+
+ OBJS = libircclient.o
+
+-all: @TARGET@
++all: lib
+
+ static: libircclient.a
+ shared: libircclient.so
+ shared_mingw: libircclient.dll
+
++lib: shared static
++
+ install: lib
+ -mkdir -p $(DESTDIR)@prefix@/include
+ -mkdir -p $(DESTDIR)@prefix@/lib
+--
+1.8.0
+
diff --git a/libs/libircclient/BUILD b/libs/libircclient/BUILD
new file mode 100755
index 0000000..e3204b6
--- /dev/null
+++ b/libs/libircclient/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --enable-ipv6" &&
+default_build
diff --git a/libs/libircclient/DEPENDS b/libs/libircclient/DEPENDS
new file mode 100755
index 0000000..292834a
--- /dev/null
+++ b/libs/libircclient/DEPENDS
@@ -0,0 +1,4 @@
+optional_depends openssl \
+ "--enable-openssl" \
+ "--disable-openssl" \
+ "compile with OpenSSL support"
diff --git a/libs/libircclient/DETAILS b/libs/libircclient/DETAILS
new file mode 100755
index 0000000..8a2d943
--- /dev/null
+++ b/libs/libircclient/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libircclient
+ VERSION=1.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.ulduzsoft.com/linux/libircclient/"
+ LICENSE[0]=LGPL
+ ENTERED=20121209
+ SHORT="a small but extremely powerful library which implements
the IRC protocol"
+cat << EOF
+libircclient is a small but extremely powerful library which implements
+the IRC protocol. It is designed to be small, fast, portable and compatible
+with the RFC standards as well as non-standard but popular features. It is
+perfect for building the IRC clients and bots.
+EOF
diff --git a/libs/libircclient/HISTORY b/libs/libircclient/HISTORY
new file mode 100644
index 0000000..59632d5
--- /dev/null
+++ b/libs/libircclient/HISTORY
@@ -0,0 +1,6 @@
+2012-12-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+ * DETAILS: fixed messed up VERSION, SOURCE, SOURCE_URL and
SOURCE_DIRECTORY
+ * PRE_BUILD,
0001-fix-install-target-build-shared-and-static-library.patch:
+ build static and shared library, fix install target
+
diff --git a/libs/libircclient/PRE_BUILD b/libs/libircclient/PRE_BUILD
new file mode 100755
index 0000000..476342a
--- /dev/null
+++ b/libs/libircclient/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 <
${SPELL_DIRECTORY}/0001-fix-install-target-build-shared-and-static-library.patch
diff --git a/libs/miniupnpc/BUILD b/libs/miniupnpc/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/miniupnpc/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/miniupnpc/DETAILS b/libs/miniupnpc/DETAILS
new file mode 100755
index 0000000..04ab90f
--- /dev/null
+++ b/libs/miniupnpc/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=miniupnpc
+ VERSION=1.7.20120830
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]="http://miniupnp.free.fr/files/download.php?file=${SOURCE}"
+
SOURCE_HASH=sha512:cb1635bea248c0205efd576a0710c201426bfd4c2f4e6b1804cfa35d96c06ba702af78ce917f82d8bff0c75db8a182844342711ff21fa3a4f1bfcfed18d10900
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://miniupnp.free.fr/"
+ LICENSE[0]=BSD
+ ENTERED=20121209
+ SHORT="support for the UPnP Internet Gateway Device (IGD)
specifications"
+cat << EOF
+The UPnP protocol is supported by most home adsl/cable routers and Microsoft
+Windows 2K/XP. The aim of the MiniUPnP project is to bring a free software
+solution to support the "Internet Gateway Device" part of the protocol.
+EOF
diff --git a/libs/miniupnpc/HISTORY b/libs/miniupnpc/HISTORY
new file mode 100644
index 0000000..972e811
--- /dev/null
+++ b/libs/miniupnpc/HISTORY
@@ -0,0 +1,3 @@
+2012-12-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, INSTALL: spell created
+
diff --git a/libs/miniupnpc/INSTALL b/libs/miniupnpc/INSTALL
new file mode 100755
index 0000000..f138d0d
--- /dev/null
+++ b/libs/miniupnpc/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+install -m644 ${SOURCE_DIRECTORY}/portlistingparse.h
${INSTALL_ROOT}/usr/include/${SPELL}/ &&
+install -m644 ${SOURCE_DIRECTORY}/miniupnpctypes.h
${INSTALL_ROOT}/usr/include/${SPELL}/
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index c9e873b..444032e 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
SPELL=pyqt4
SPELLX=PyQt-x11-gpl
- VERSION=4.9.5
-
SOURCE_HASH=sha512:27891944f35c66476b045cc5398e32d8566bc25d95e893a17f518f85f3a8b0ccbf1b56e148d086f5563259c76cf89e63057f9c77e16876343643235a930b0856
+ VERSION=4.9.6
+
SOURCE_HASH=sha512:1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa
URI=PyQt4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index b0df8fa..e0448da 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.9.6
+
2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.9.5
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index e2979b5..16fd00d 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.14
-
SOURCE_HASH=sha512:ac6d98f2e4f7094e5065a32e107dc7ffce28fac5fa805407c1b670192a9438235a5235dee52833fb9667e1e0a12c29b571d1fa8f315a96fa2728a8b08d08c405
+ VERSION=4.14.2
+
SOURCE_HASH=sha512:d23eba57c271e5ed4f9e434709108c33bca0166987606b02b48485996d4de385d6c6057e5b0432f18248b3b786f2dce7e80a06f8dce848b90a046418dd294ec6
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index ae7fee4..ddae31b 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.14.2
+
2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.14
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index 36fa790..ce5d16b 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,6 +1,7 @@
conflicts courier-imap &&
conflicts masqmail &&
conflicts esmtp &&
+conflicts msmtp &&
conflicts exim &&
conflicts postfix &&
conflicts sendmail &&
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 496ca4e..b59422b 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added masqmail
diff --git a/mail/esmtp/CONFLICTS b/mail/esmtp/CONFLICTS
index 6482df0..b307ae3 100755
--- a/mail/esmtp/CONFLICTS
+++ b/mail/esmtp/CONFLICTS
@@ -1,6 +1,7 @@
conflicts masqmail &&
conflicts courier &&
conflicts exim &&
+conflicts msmtp &&
conflicts postfix &&
conflicts sendmail &&
conflicts netqmail
diff --git a/mail/esmtp/HISTORY b/mail/esmtp/HISTORY
index 7862f87..53f4369 100644
--- a/mail/esmtp/HISTORY
+++ b/mail/esmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added masqmail
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index d8f360d..bbea228 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,6 +1,7 @@
conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
+conflicts msmtp &&
conflicts postfix &&
conflicts sendmail &&
conflicts netqmail
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 345683d..a3b90e0 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp
+
2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.80.1; SECURITY_PATCH++; updated source
uri
* PREPARE: added query for 4.80 migration
diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS
index a1641aa..55ac40d 100755
--- a/mail/masqmail/CONFLICTS
+++ b/mail/masqmail/CONFLICTS
@@ -1,6 +1,7 @@
conflicts exim &&
conflicts courier &&
conflicts esmtp &&
+conflicts msmtp &&
conflicts postfix &&
conflicts sendmail &&
conflicts netqmail
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 5b53f50..43e78f6 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp
+
2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: set up /var/spool/mail under 'mail' group; changed mode to
diff --git a/mail/msmtp/CONFIGURE b/mail/msmtp/CONFIGURE
index 6cf958f..fac0900 100755
--- a/mail/msmtp/CONFIGURE
+++ b/mail/msmtp/CONFIGURE
@@ -1,4 +1,6 @@
config_query_list MSMTP_SSL "Which SSL backend do you want for TLS/SSL
support?" \
gnutls \
openssl \
- none
+ none &&
+
+config_query MSMTP_SENDMAIL "Enable Sendmail mode?" y
diff --git a/mail/msmtp/CONFLICTS b/mail/msmtp/CONFLICTS
new file mode 100755
index 0000000..cd95683
--- /dev/null
+++ b/mail/msmtp/CONFLICTS
@@ -0,0 +1,7 @@
+conflicts exim &&
+conflicts courier &&
+conflicts esmtp &&
+conflicts postfix &&
+conflicts sendmail &&
+conflicts netqmail &&
+conflicts masqmail
diff --git a/mail/msmtp/DETAILS b/mail/msmtp/DETAILS
index a09132a..8ec9cdf 100755
--- a/mail/msmtp/DETAILS
+++ b/mail/msmtp/DETAILS
@@ -1,15 +1,15 @@
SPELL=msmtp
- VERSION=1.4.27
+ VERSION=1.4.30
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:0094b52cf8ea73c0fc06755d5e917e6695b458800751fa5c9c65d8f07fb2344d52189b16ebf31706a01f72e6d7a1e2657cfec87d1109d798a97a0b2bcf2948f7
+
SOURCE_HASH=sha512:6ebbf6d4f077bf5dc43d43fdc8b83d131364df5b82ebaa12f93f1a78ef8457c500ded0f6d3ee5b8a7825d292d5338743fd32899fd699dcbe2924064723a5f021
WEB_SITE=http://msmtp.sourceforge.net/
ENTERED=20040412
LICENSE[0]=GPL
KEYWORDS="email mail"
- SHORT="SMTP client"
+ SHORT="SMTP client/mail forwarder"
cat << EOF
In the default mode, it transmits a mail to an SMTP server (for example
at a free mail provider) which does the delivery.
diff --git a/mail/msmtp/HISTORY b/mail/msmtp/HISTORY
index ce24828..ed5bf67 100644
--- a/mail/msmtp/HISTORY
+++ b/mail/msmtp/HISTORY
@@ -1,3 +1,9 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.30; added desc about mail forwarding
+ * PROVIDES: added SENDMAIL
+ * CONFLICTS: added
+ * INSTALL: added, for sendmail symlinks
+
2012-01-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.27
diff --git a/mail/msmtp/INSTALL b/mail/msmtp/INSTALL
new file mode 100755
index 0000000..6b75bbf
--- /dev/null
+++ b/mail/msmtp/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+
+install_config_file doc/msmtprc-system.example "$INSTALL_ROOT/etc/msmtprc" &&
+
+if [[ $MSMTP_SENDMAIL == y ]]; then
+ ln -vsf "$TRACK_ROOT/usr/bin/msmtp" "$INSTALL_ROOT/usr/lib/sendmail" &&
+ ln -vsf "$TRACK_ROOT/usr/bin/msmtp" "$INSTALL_ROOT/usr/sbin/sendmail"
+fi
diff --git a/mail/msmtp/PROVIDES b/mail/msmtp/PROVIDES
index 397895d..bebbaa4 100755
--- a/mail/msmtp/PROVIDES
+++ b/mail/msmtp/PROVIDES
@@ -1 +1,2 @@
MAIL-TRANSPORT-AGENT
+SENDMAIL
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index b94f6db..bf2e19c 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,4 +1,7 @@
conflicts masqmail &&
+conflicts courier &&
conflicts exim &&
+conflicts esmtp &&
+conflicts msmtp &&
conflicts qmail &&
conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index dd7b0bd..f6cce7b 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp, esmtp, courier
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.2
diff --git a/mail/sendmail/CONFLICTS b/mail/sendmail/CONFLICTS
index 38cde47..e2ef8e5 100755
--- a/mail/sendmail/CONFLICTS
+++ b/mail/sendmail/CONFLICTS
@@ -1,6 +1,7 @@
conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
+conflicts msmtp &&
conflicts exim &&
conflicts postfix &&
conflicts netqmail
diff --git a/mail/sendmail/HISTORY b/mail/sendmail/HISTORY
index 98ec9e1..a41e1e4 100644
--- a/mail/sendmail/HISTORY
+++ b/mail/sendmail/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added msmtp
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added masqmail
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 48cd14b..3ecf4a1 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,12 +1,12 @@
SPELL=samba
- VERSION=3.6.9
+ VERSION=3.6.10
SECURITY_PATCH=18
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7
+
SOURCE_HASH=sha512:9600a9830b8d4d6735b48429fe4d056b97136d765ad6b1dfbc35cf828bbd19af6ec78d886ad8388140e9028a90c201a969edf33e4d79fd5c6ca1cc68448ffd2e
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 359e778..8fd4b58 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.10
+
2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6.9
diff --git a/python-pypi/alembic/DETAILS b/python-pypi/alembic/DETAILS
index f6226b2..54cb626 100755
--- a/python-pypi/alembic/DETAILS
+++ b/python-pypi/alembic/DETAILS
@@ -1,6 +1,6 @@
SPELL=alembic
- VERSION=0.4.0
-
SOURCE_HASH=sha512:946d70501fda1ae9ea87e0a105092da7e9436010fc234d2cb6266c1f38a0dcd99fa3e22c22c040e6ee5af53e8a1083e3462185bdd55a6de6dee5d94287a5266c
+ VERSION=0.4.1
+
SOURCE_HASH=sha512:c5a248ac1efbab6c4f902bd481cb5f24b679eba024f95a089c04f9bf28d309ce56aa666e90f6a1c00456e94ca0b3a4298a871bee5f07854d60aec6d3654fb925
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/a/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/alembic/HISTORY b/python-pypi/alembic/HISTORY
index adb1a5e..75c5adc 100644
--- a/python-pypi/alembic/HISTORY
+++ b/python-pypi/alembic/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.1
+
2012-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.0
diff --git a/security/fwknop/BUILD b/security/fwknop/BUILD
new file mode 100755
index 0000000..d22e99f
--- /dev/null
+++ b/security/fwknop/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/security/fwknop/DETAILS b/security/fwknop/DETAILS
index 14eda1c..002e3a5 100755
--- a/security/fwknop/DETAILS
+++ b/security/fwknop/DETAILS
@@ -1,5 +1,5 @@
SPELL=fwknop
- VERSION=2.0.3
+ VERSION=2.0.4
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/security/fwknop/HISTORY b/security/fwknop/HISTORY
index 4305df7..5c820c1 100644
--- a/security/fwknop/HISTORY
+++ b/security/fwknop/HISTORY
@@ -1,3 +1,8 @@
+2012-12-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.4
+ * BUILD: added, to fix multijob build
+ * PRE_BUILD, command.patch, digest.patch: dropped, fixed by upstream
+
2012-09-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.3; SECURITY_PATCH++
* INSTALL: dropped, fixed by upstream
diff --git a/security/fwknop/PRE_BUILD b/security/fwknop/PRE_BUILD
deleted file mode 100755
index a2c62d7..0000000
--- a/security/fwknop/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/command.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/digest.patch"
diff --git a/security/fwknop/command.patch b/security/fwknop/command.patch
deleted file mode 100644
index 640a7fe..0000000
--- a/security/fwknop/command.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/fko_decode.c.orig Wed Sep 5 06:04:48 2012
-+++ lib/fko_decode.c Sat Sep 8 15:11:00 2012
-@@ -285,9 +285,9 @@ fko_decode_spa_data(fko_ctx_t ctx)
-
- b64_decode(tbuf, (unsigned char*)ctx->message);
-
-- /* Require a message similar to: 1.2.3.4,tcp/22
-+ /* Require a message similar to: 1.2.3.4,tcp/22 (if it's not command
message)
- */
-- if(validate_access_msg(ctx->message) != FKO_SUCCESS)
-+ if(ctx->message_type != FKO_COMMAND_MSG &&
validate_access_msg(ctx->message) != FKO_SUCCESS)
- {
- free(tbuf);
- return(FKO_ERROR_INVALID_DATA);
diff --git a/security/fwknop/digest.patch b/security/fwknop/digest.patch
deleted file mode 100644
index 04e1a0c..0000000
--- a/security/fwknop/digest.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- server/replay_cache.c.orig Wed Sep 5 06:04:48 2012
-+++ server/replay_cache.c Sat Sep 8 09:46:56 2012
-@@ -565,7 +565,6 @@ is_replay_dbm_cache(fko_srv_options_t *opts, char *dig
- #endif
- datum db_key, db_ent;
-
-- char *digest = NULL;
- int digest_len, res = SPA_MSG_SUCCESS;
-
- digest_cache_info_t dc_info;
-@@ -638,7 +637,6 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
- #endif
- datum db_key, db_ent;
-
-- char *digest = NULL;
- int digest_len, res = SPA_MSG_SUCCESS;
-
- digest_cache_info_t dc_info;
-@@ -705,7 +703,7 @@ add_replay_dbm_cache(fko_srv_options_t *opts, char *di
-
- return(res);
- #endif /* NO_DIGEST_CACHE */
--
-+}
- #endif /* USE_FILE_CACHE */
-
- #if USE_FILE_CACHE
diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 6002d09..77780bb 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -13,6 +13,8 @@ if [[ $XEN_HVM == y ]]; then
depends sdl
fi &&
+optional_depends gnutls "" "" "for TLS support in VNC" &&
+
suggest_depends lxml "" "" "for XenAPI support in XM" &&
suggest_depends pyopenssl "" "" "for SSL support" &&
suggest_depends python-pam "" "" "for PAM support"
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 6d6300b..16bd6aa 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,6 @@
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added gnutls optional dependency
+
2012-12-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH+=2
* PRE_BUILD: apply patches
diff --git a/video/smplayer/DETAILS b/video/smplayer/DETAILS
index fb081ed..6391778 100755
--- a/video/smplayer/DETAILS
+++ b/video/smplayer/DETAILS
@@ -1,8 +1,8 @@
SPELL=smplayer
- VERSION=0.8.1
+ VERSION=0.8.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:3e2afdfb9ae14ce22ff4be36673db328295ee79538fc41bbff2296ee4d050534054f35e13d16efdb2fe40cae1d2874678b614357b3714fde55508e3cae810556
+
SOURCE_HASH=sha512:dafcd3a1b9d2e62abccf13ec3a800d3bcf34d4a9ada274a8e2f8587448403413f3b01c563ab3274dc4108ab953ffdc870990bff9f11a5ab2990ab2e49b889db9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://smplayer.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video/smplayer/HISTORY b/video/smplayer/HISTORY
index 34f6c1d..da7bcfb 100644
--- a/video/smplayer/HISTORY
+++ b/video/smplayer/HISTORY
@@ -1,3 +1,6 @@
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.2
+
2012-09-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.1
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (792dcfa0f00760bf6d098de6c6f07c94688d608c), Eric Sandall, 12/10/2012
Archive powered by MHonArc 2.6.24.