summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Cook2012-01-27 18:41:12 -0600
committerRobin Cook2012-01-27 18:41:12 -0600
commit3bcc6ef36b37386fdd8a5f7df4b1c76442e3c8af (patch)
treed7ff1199e90364ec13c12911e6d00d14a54fd5e4
parentf625bc176a49eeef9182711944fee76cb5e1d24d (diff)
parentf0dc0451f3a5d42e3e659a85f3471d808baaa3d6 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog27
-rwxr-xr-xaccounts1
-rwxr-xr-xarchive-libs/libzip/DETAILS4
-rw-r--r--archive-libs/libzip/HISTORY4
-rwxr-xr-xarchive-libs/libzip/UP_TRIGGERS9
-rwxr-xr-xarchive-libs/snappy/DETAILS15
-rw-r--r--archive-libs/snappy/HISTORY2
-rwxr-xr-xarchive/unrar/DETAILS4
-rw-r--r--archive/unrar/HISTORY3
-rw-r--r--crypto/6581B5F1.gpg (renamed from crypto/cyrus-sasl/6581B5F1.gpg)bin1248 -> 1248 bytes
-rwxr-xr-xcrypto/cyrus-sasl/DETAILS4
-rw-r--r--crypto/cyrus-sasl/HISTORY8
-rwxr-xr-xcrypto/cyrus-sasl/PRE_BUILD7
-rw-r--r--crypto/cyrus-sasl/db5.patch24
-rw-r--r--crypto/cyrus-sasl/gcc44.diff20
-rwxr-xr-xcrypto/gpa/DETAILS5
-rw-r--r--crypto/gpa/HISTORY6
-rw-r--r--crypto/libsasl/6581B5F1.gpgbin1248 -> 0 bytes
-rwxr-xr-xcrypto/openssl/DETAILS8
-rw-r--r--crypto/openssl/HISTORY4
-rwxr-xr-xcrypto/pcsc-lite/DETAILS6
-rw-r--r--crypto/pcsc-lite/HISTORY3
-rwxr-xr-xdatabase/sqlite/DETAILS6
-rw-r--r--database/sqlite/HISTORY3
-rw-r--r--devel/binutils/HISTORY3
-rwxr-xr-xdevel/binutils/INSTALL4
-rwxr-xr-xdevel/git/DETAILS8
-rw-r--r--devel/git/HISTORY3
-rwxr-xr-xdisk/grub2/DEPENDS1
-rwxr-xr-xdisk/grub2/DETAILS1
-rw-r--r--disk/grub2/HISTORY10
-rwxr-xr-xdisk/grub2/PRE_BUILD3
-rw-r--r--disk/grub2/fix-udev.patch21
-rwxr-xr-xdisk/libewf/DETAILS11
-rw-r--r--disk/libewf/HISTORY4
-rwxr-xr-xdisk/nilfs-utils/DETAILS4
-rw-r--r--disk/nilfs-utils/HISTORY3
-rwxr-xr-xdisk/ntfs-3g/BUILD2
-rwxr-xr-xdisk/ntfs-3g/CONFIGURE6
-rwxr-xr-xdisk/ntfs-3g/DEPENDS7
-rwxr-xr-xdisk/ntfs-3g/DETAILS6
-rw-r--r--disk/ntfs-3g/HISTORY9
-rwxr-xr-xdisk/sdparm/DETAILS4
-rw-r--r--disk/sdparm/HISTORY3
-rwxr-xr-xdisk/sg3_utils/DETAILS4
-rw-r--r--disk/sg3_utils/HISTORY3
-rwxr-xr-xdisk/xcdroast/DEPENDS2
-rw-r--r--disk/xcdroast/HISTORY3
-rwxr-xr-xdoc/docx2txt/DETAILS4
-rw-r--r--doc/docx2txt/HISTORY4
-rwxr-xr-xdoc/docx2txt/INSTALL2
-rwxr-xr-xeditors/focuswriter/BUILD1
-rwxr-xr-xeditors/focuswriter/DEPENDS4
-rwxr-xr-xeditors/focuswriter/DETAILS13
-rw-r--r--editors/focuswriter/HISTORY2
-rwxr-xr-xgnome2-apps/gthumb2/DETAILS2
-rw-r--r--gnome2-apps/gthumb2/HISTORY4
-rwxr-xr-xgnome2-apps/gthumb2/PRE_BUILD5
-rw-r--r--gnome2-apps/gthumb2/gthumb-2.14.1.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/gthumb2/gthumb-2.14.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-apps/vinagre/DEPENDS2
-rw-r--r--gnome2-apps/vinagre/HISTORY3
-rwxr-xr-xgnome2-libs/gjs/DETAILS4
-rw-r--r--gnome2-libs/gjs/HISTORY3
-rw-r--r--gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gjs/gjs-1.30.1.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/libsoup/DEPENDS3
-rwxr-xr-xgnome2-libs/libsoup/DETAILS5
-rw-r--r--gnome2-libs/libsoup/HISTORY6
-rw-r--r--gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sigbin0 -> 72 bytes
-rwxr-xr-xgnome2-libs/mutter/DETAILS4
-rw-r--r--gnome2-libs/mutter/HISTORY3
-rw-r--r--gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/mutter/mutter-3.2.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome3-apps/gnome-color-manager/DETAILS4
-rw-r--r--gnome3-apps/gnome-color-manager/HISTORY3
-rw-r--r--gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome3-libs/gnome-shell/DETAILS4
-rw-r--r--gnome3-libs/gnome-shell/HISTORY6
-rw-r--r--gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics-libs/fop/DETAILS4
-rw-r--r--graphics-libs/fop/HISTORY3
-rw-r--r--graphics-libs/fop/fop.gpgbin893 -> 10402 bytes
-rwxr-xr-xgraphics-libs/freeglut/DETAILS4
-rw-r--r--graphics-libs/freeglut/HISTORY3
-rwxr-xr-xgraphics-libs/libvisio/DETAILS4
-rw-r--r--graphics-libs/libvisio/HISTORY5
-rwxr-xr-xgraphics-libs/poppler/DETAILS8
-rw-r--r--graphics-libs/poppler/HISTORY3
-rwxr-xr-xgraphics/darktable/BUILD7
-rwxr-xr-xgraphics/darktable/DEPENDS18
-rwxr-xr-xgraphics/darktable/DETAILS16
-rw-r--r--graphics/darktable/HISTORY3
-rwxr-xr-xgraphics/mypaint/DETAILS4
-rw-r--r--graphics/mypaint/HISTORY3
-rwxr-xr-xgroups1
-rwxr-xr-xhttp/webkitgtk/DEPENDS2
-rw-r--r--http/webkitgtk/HISTORY3
-rwxr-xr-xkernels/kmod/DETAILS14
-rw-r--r--kernels/kmod/HISTORY4
-rwxr-xr-xkernels/kmod/PRE_BUILD4
-rw-r--r--kernels/linux/HISTORY4
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.2.25
-rw-r--r--kernels/linux/latest.defaults2
-rwxr-xr-xlibs/jansson/DETAILS18
-rw-r--r--libs/jansson/HISTORY3
-rwxr-xr-xlibs/libgksu/BUILD3
-rw-r--r--libs/libgksu/HISTORY5
-rwxr-xr-xlibs/libgksu/PRE_BUILD2
-rw-r--r--libs/libgksu/forkpty.patch358
-rwxr-xr-xlibs/libidn/DETAILS2
-rw-r--r--libs/libidn/HISTORY3
-rwxr-xr-xlibs/libnih/DETAILS10
-rw-r--r--libs/libnih/HISTORY3
-rwxr-xr-xlibs/libnl/DETAILS6
-rw-r--r--libs/libnl/HISTORY4
-rw-r--r--libs/libnl/libnl-3.pc (renamed from libs/libnl/libnl-1.pc)2
-rwxr-xr-xlibs/orc/DETAILS4
-rw-r--r--libs/orc/HISTORY3
-rwxr-xr-xlibs/pcre/BUILD1
-rwxr-xr-xlibs/pcre/CONFIGURE1
-rwxr-xr-xlibs/pcre/DEPENDS13
-rw-r--r--libs/pcre/HISTORY5
-rwxr-xr-xmail/courier/CONFLICTS1
-rw-r--r--mail/courier/HISTORY3
-rwxr-xr-xmail/esmtp/CONFLICTS1
-rw-r--r--mail/esmtp/HISTORY3
-rwxr-xr-xmail/exim/CONFLICTS1
-rw-r--r--mail/exim/HISTORY3
-rwxr-xr-xmail/masqmail/BUILD10
-rwxr-xr-xmail/masqmail/CONFIGURE11
-rwxr-xr-xmail/masqmail/CONFLICTS6
-rwxr-xr-xmail/masqmail/DEPENDS6
-rwxr-xr-xmail/masqmail/DETAILS47
-rw-r--r--mail/masqmail/HISTORY3
-rwxr-xr-xmail/masqmail/INSTALL24
-rwxr-xr-xmail/masqmail/PROVIDES2
-rwxr-xr-xmail/masqmail/SECURITY3
-rwxr-xr-xmail/masqmail/init.d/masqmail11
-rw-r--r--mail/masqmail/init.d/masqmail.conf10
-rw-r--r--mail/masqmail/masqmail.gpgbin0 -> 1167 bytes
-rwxr-xr-xmail/postfix/CONFLICTS1
-rw-r--r--mail/postfix/HISTORY3
-rwxr-xr-xmail/qmail/CONFLICTS1
-rw-r--r--mail/qmail/HISTORY3
-rwxr-xr-xmail/sendmail/CONFLICTS1
-rw-r--r--mail/sendmail/HISTORY3
-rwxr-xr-xmail/ssmtp/CONFLICTS1
-rw-r--r--mail/ssmtp/HISTORY3
-rwxr-xr-xnet/cacti/DETAILS18
-rw-r--r--net/cacti/HISTORY5
-rwxr-xr-xnet/cacti/INSTALL7
-rwxr-xr-xnet/cacti/PREPARE4
-rwxr-xr-xnet/cacti/PRE_BUILD14
-rw-r--r--net/cacti/patches/settings_checkbox.patch56
-rwxr-xr-xnet/cifs-utils/DETAILS4
-rw-r--r--net/cifs-utils/HISTORY3
-rwxr-xr-xnet/ethtool/DETAILS4
-rw-r--r--net/ethtool/HISTORY3
-rwxr-xr-xnet/iproute2/BUILD2
-rwxr-xr-xnet/iproute2/DEPENDS6
-rwxr-xr-xnet/iproute2/DETAILS15
-rw-r--r--net/iproute2/HISTORY8
-rwxr-xr-xnet/iproute2/PRE_BUILD2
-rw-r--r--net/iproute2/m_xt.patch28
-rwxr-xr-xnet/ipset/DETAILS4
-rw-r--r--net/ipset/HISTORY3
-rwxr-xr-xnet/samba/DETAILS4
-rw-r--r--net/samba/HISTORY3
-rwxr-xr-xnet/spine/DETAILS4
-rw-r--r--net/spine/HISTORY3
-rwxr-xr-xperl-cpan/io-socket-ssl/DETAILS2
-rw-r--r--perl-cpan/io-socket-ssl/HISTORY3
-rw-r--r--perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xperl-cpan/net-ssleay/DETAILS6
-rw-r--r--perl-cpan/net-ssleay/HISTORY3
-rw-r--r--perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xpython-pypi/gdata/DETAILS4
-rw-r--r--python-pypi/gdata/HISTORY3
-rwxr-xr-xpython-pypi/python-ldap/DEPENDS5
-rwxr-xr-xpython-pypi/python-ldap/DETAILS6
-rw-r--r--python-pypi/python-ldap/HISTORY5
-rwxr-xr-xpython-pypi/python-ldap/PRE_BUILD11
-rwxr-xr-xpython-pypi/twisted/DETAILS4
-rw-r--r--python-pypi/twisted/HISTORY3
-rwxr-xr-xpython-pypi/zopeinterface/DETAILS4
-rw-r--r--python-pypi/zopeinterface/HISTORY3
-rwxr-xr-xshell-term-fm/rdesktop/DEPENDS7
-rw-r--r--shell-term-fm/rdesktop/HISTORY5
-rwxr-xr-xshell-term-fm/rdesktop/PRE_BUILD4
-rw-r--r--shell-term-fm/rdesktop/config.patch11
-rwxr-xr-xshell-term-fm/rxvt-unicode/DETAILS4
-rw-r--r--shell-term-fm/rxvt-unicode/HISTORY3
-rwxr-xr-xshell-term-fm/shared-mime-info/DETAILS4
-rw-r--r--shell-term-fm/shared-mime-info/HISTORY4
-rwxr-xr-xshell-term-fm/shared-mime-info/PRE_BUILD5
-rwxr-xr-xshell-term-fm/tmux/DETAILS4
-rw-r--r--shell-term-fm/tmux/HISTORY3
-rwxr-xr-xsmgl/upstart/DETAILS16
-rw-r--r--smgl/upstart/HISTORY10
-rwxr-xr-xsmgl/upstart/PRE_BUILD2
-rw-r--r--smgl/upstart/upstart.gpgbin0 -> 187026 bytes
-rwxr-xr-xutils/i7z/BUILD10
-rwxr-xr-xutils/i7z/DEPENDS2
-rwxr-xr-xutils/i7z/DETAILS13
-rw-r--r--utils/i7z/HISTORY2
-rwxr-xr-xutils/i7z/INSTALL6
-rwxr-xr-xutils/ntp/DEPENDS6
-rw-r--r--utils/ntp/HISTORY3
-rwxr-xr-xutils/pciutils/DETAILS4
-rw-r--r--utils/pciutils/HISTORY3
-rwxr-xr-xutils/stow/DETAILS5
-rw-r--r--utils/stow/HISTORY3
-rwxr-xr-xutils/winusb/DEPENDS9
-rwxr-xr-xutils/winusb/DETAILS23
-rw-r--r--utils/winusb/HISTORY9
-rwxr-xr-xutils/winusb/PRE_BUILD4
-rw-r--r--utils/winusb/parted+ntfs-3g.patch20
-rwxr-xr-xutils/youtube-dl/DETAILS4
-rw-r--r--utils/youtube-dl/HISTORY3
-rwxr-xr-xvideo-libs/live/DETAILS4
-rw-r--r--video-libs/live/HISTORY3
-rwxr-xr-xvideo/guvcview/DETAILS4
-rw-r--r--video/guvcview/HISTORY3
-rwxr-xr-xvideo/lives/DETAILS4
-rw-r--r--video/lives/HISTORY3
-rwxr-xr-xvideo/miro/DETAILS4
-rw-r--r--video/miro/HISTORY3
-rw-r--r--windowmanagers/aewm/HISTORY3
-rwxr-xr-xwindowmanagers/aewm/PRE_BUILD4
-rw-r--r--windowmanagers/awesome/HISTORY3
-rwxr-xr-xwindowmanagers/awesome/PRE_BUILD3
-rwxr-xr-xx11-libs/dbusmenu/DEPENDS17
-rwxr-xr-xx11-libs/dbusmenu/DETAILS16
-rw-r--r--x11-libs/dbusmenu/HISTORY3
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY3
-rwxr-xr-xx11-toolkits/gtk+2/DETAILS4
-rw-r--r--x11-toolkits/gtk+2/HISTORY3
-rw-r--r--x11-toolkits/gtk+2/gtk+-2.24.8.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--x11-toolkits/gtk+2/gtk+-2.24.9.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xx11/colord/DETAILS4
-rw-r--r--x11/colord/HISTORY3
-rwxr-xr-xx11/colord/PRE_BUILD5
-rwxr-xr-xx11/gtk-vnc/DEPENDS2
-rw-r--r--x11/gtk-vnc/HISTORY7
-rwxr-xr-xx11/gtk-vnc/PRE_SUB_DEPENDS6
-rwxr-xr-xx11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS8
-rwxr-xr-xx11/gtk-vnc/SUB_DEPENDS11
253 files changed, 1443 insertions, 285 deletions
diff --git a/ChangeLog b/ChangeLog
index 08f788ac3b..d54fdcb038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2012-01-23 Arjan Bouter <abouter@sourcemage.org>
+ * x11-libs/dbusmenu: new spell, indicator dbus lib
+
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * utils/i7z: new spell, i7 (and now i3, i5) reporting tool for Linux
+
+2012-01-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * libs/jansson: new spell, a library for manipulating JSON data
+ * graphics/darktable: new spell, a photography workflow application and RAW
+ developer
+
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * utils/winusb: new spell, program to create Windows USB stick installer
+ from CD/DVD
+
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * editors/focuswriter: new, simple, distraction-free writing environment
+
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * accounts, groups: added account data for masqmail
+ * mail/masqmail: new spell, MTA for workstations and for servers in
+ small networks
+ * crypto/6581B5F1.gpg: moved from libsasl spell
+
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * archive-libs/snappy: new, fast compression/decompression library
+
2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* wm-addons/netwmpager: new spell, an EWMH compliant pager
* wm-addons/light-monitor: new spell, a panel for window managers
diff --git a/accounts b/accounts
index 45531bf7e0..7cc238f3cb 100755
--- a/accounts
+++ b/accounts
@@ -96,4 +96,5 @@ dspam:187:188
nslcd:188:189
redis:189:190
lightdm:191:191
+masqmail:192:192
nobody:65534:65534
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
index 3453eca9fb..825daac2ce 100755
--- a/archive-libs/libzip/DETAILS
+++ b/archive-libs/libzip/DETAILS
@@ -1,6 +1,6 @@
SPELL=libzip
- VERSION=0.9.3
- SOURCE_HASH=sha512:e10e563d79dbe633e8dc10e47c4b724be08d1d15176f46ba0dc433c6a8697484a55c2778d37ce93fbf760ca27a6d12268520d1af79aa0fa3e6926648ccd161e5
+ VERSION=0.10
+ SOURCE_HASH=sha512:5d42fae92d04dae038c416debabfb11293d66ad886a0189b7409c15efe36b759a8908c7b492084e252d1a0a5a9fe142cc97a5e339e4fd936253189a6097dc710
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.nih.at/libzip
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 62809521b7..c1b185f44a 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,7 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.10
+ * UP_TRIGGERS: added, libzip.so.1 -> libzip.so.2
+
2010-06-27 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.3
diff --git a/archive-libs/libzip/UP_TRIGGERS b/archive-libs/libzip/UP_TRIGGERS
new file mode 100755
index 0000000000..abfbe0ef57
--- /dev/null
+++ b/archive-libs/libzip/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/archive-libs/snappy/DETAILS b/archive-libs/snappy/DETAILS
new file mode 100755
index 0000000000..ed55d03a43
--- /dev/null
+++ b/archive-libs/snappy/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=snappy
+ VERSION=1.0.4
+ SOURCE_HASH=sha512:34e70dc35af9e8d7601618c2521be0cd0ba74907b8e67362d02c515c06c7bf2a2f58dac3dfed75270b7d9c9a1d6ec408c76e3665dc70bbeda8f87584cb4f01b0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://snappy.googlecode.com/files/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://code.google.com/p/snappy/
+ LICENSE[0]=BSD
+ ENTERED=20120116
+ SHORT="fast compression/decompression library"
+cat << EOF
+Snappy is a compression/decompression library. It does not aim for maximum
+compression, or compatibility with any other compression library; instead,
+it aims for very high speeds and reasonable compression.
+EOF
diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY
new file mode 100644
index 0000000000..7351a51195
--- /dev/null
+++ b/archive-libs/snappy/HISTORY
@@ -0,0 +1,2 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: spell created, version 1.0.4
diff --git a/archive/unrar/DETAILS b/archive/unrar/DETAILS
index 175fba7ccd..11fb095e35 100755
--- a/archive/unrar/DETAILS
+++ b/archive/unrar/DETAILS
@@ -1,11 +1,11 @@
SPELL=unrar
- VERSION=4.1.3
+ VERSION=4.1.4
SOURCE=${SPELL}src-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://www.rarlab.com/rar/$SOURCE
WEB_SITE=http://www.rarlab.com
ENTERED=20011117
- SOURCE_HASH=sha512:fd853a844bdd5ba40049c7be569a443bb927f3a324dfdb981d9ccaebe6768e8b695e5f84aa10052f3b559ebb60a59a559f64f721d792dc0500d16a6b69a0f607
+ SOURCE_HASH=sha512:585e817d3246a4b5cc960298a40ae07c25d54becef680b67e59a441a279de3305a764ec455924eff09e8869dcceac2242e5657e8a3a9b741ca29e848e5f9c8e2
LICENSE[0]=freeware
KEYWORDS="archive"
SHORT="unRAR is a utility to extract, view, and test the contents of an RAR archive, version 1.50 and above."
diff --git a/archive/unrar/HISTORY b/archive/unrar/HISTORY
index d22bb994d5..a9809881f0 100644
--- a/archive/unrar/HISTORY
+++ b/archive/unrar/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 4.1.4
+
2012-01-12 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.1.3
diff --git a/crypto/cyrus-sasl/6581B5F1.gpg b/crypto/6581B5F1.gpg
index eda7920283..eda7920283 100644
--- a/crypto/cyrus-sasl/6581B5F1.gpg
+++ b/crypto/6581B5F1.gpg
Binary files differ
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec850068e..d1d1c7a07e 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=cyrus-sasl
- VERSION=2.1.23
+ VERSION=2.1.25
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index e33393492c..303d2bc9b4 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,11 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * 6581B5F1.gpg: deleted, use the same key from section
+
+2012-01-18 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.1.25; quoting paths
+ * gcc44.diff: removed, fixed by upstream
+ * db5.patch: added, for db >5.0 support
+
2011-09-26 Bor Kraljič <pyrobor@ver.si>
* DETAILS: converted to upstream signature checking
* 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ec632ca52d..ba9528d40f 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/gcc44.diff
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/db5.patch b/crypto/cyrus-sasl/db5.patch
new file mode 100644
index 0000000000..522824074a
--- /dev/null
+++ b/crypto/cyrus-sasl/db5.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej@debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/crypto/cyrus-sasl/gcc44.diff b/crypto/cyrus-sasl/gcc44.diff
deleted file mode 100644
index 9f3fb531db..0000000000
--- a/crypto/cyrus-sasl/gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c 2006-05-17 18:46:17.000000000 +0200
-+++ plugins/digestmd5.c.cp 2009-04-07 16:20:31.000000000 +0200
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index c0c0982adb..729c2ade1d 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -7,9 +7,9 @@ if [ "$GPA_BRANCH" == "scm" ]; then
fi
SOURCE=$SPELL-svn.tar.bz2
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.wald.intevation.org/svn/gpa/trunk:$SPELL
SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
VERSION=0.9.0
@@ -22,9 +22,8 @@ else
SOURCE2_URL[0]=http://wald.intevation.org/frs/download.php/604/$SOURCE2
# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
-fi
-
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
WEB_SITE=http://www.gnupg.org/related_software/gpa/
ENTERED=20020312
LICENSE[0]=GPL
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index cd80a5363d..ab2a89c768 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,9 @@
+2012-01-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: duplicated SOURCE_DIRECTORY removed
+
+2012-01-24 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS: made SOURCE_DIRECTORY different for stable and scm brances
+
2011-09-26 Bor Kraljič <pyrobor@ver.si>
* DETAILS: added :UPSTREAM_KEY to SOURCE_GPG
diff --git a/crypto/libsasl/6581B5F1.gpg b/crypto/libsasl/6581B5F1.gpg
deleted file mode 100644
index eda7920283..0000000000
--- a/crypto/libsasl/6581B5F1.gpg
+++ /dev/null
Binary files differ
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c195bf3820..6f9094d3d8 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8s
- SECURITY_PATCH=14
+ VERSION=0.9.8t
+ SECURITY_PATCH=15
;;
1.0)
- VERSION=1.0.0f
- SECURITY_PATCH=14
+ VERSION=1.0.0g
+ SECURITY_PATCH=15
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 04837c3762..ad4034afc1 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.9.8t, 1.0.0g, SECURITY_PATCH=15
+ http://www.openssl.org/news/secadv_20120118.txt
+
2012-01-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.8s, 1.0.0f, SECURITY_PATCH=14
http://www.openssl.org/news/secadv_20120104.txt
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index bb7da7eaf8..8721e810b7 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.8.1
- SOURCE_HASH=sha512:fe9b8ae6654cb79af9772d2cf765e9459c3742b5cdf64b10fbe2cfbb4e8066b3e646a49517f992c480e077e856258c13d727327cd5c4da85da3b708236fa1717
+ VERSION=1.8.2
+ SOURCE_HASH=sha512:093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3687/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3695/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 8b4159583d..f8c1b010e3 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.8.2
+
2011-11-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.8.1
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index f618b843c4..092e86dd87 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.9
- VERSIONX=autoconf-3070900
- SOURCE_HASH=sha512:f2f1739af728ed6f3bd53265fdba7d1f93872daf7a8744c58cf1f54f64873ec3306fadc04d60e5e11e1f9e24caee5d3f936c4f7d7efe2e5c8562a98dfb32fb07
+ VERSION=3.7.10
+ VERSIONX=autoconf-3071000
+ SOURCE_HASH=sha512:b66ca1eb59eec97415d110879077c0c7cac24e79cdd1f98143cfaa663d5c08888bc243ac3c10efe36e1c9c15b4fb9d661882e0e80c24f2b86bf385f81e058120
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index ccd7c8bb54..0e62acbe27 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.7.10
+
2011-11-01 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.7.9
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 364f4f0fac..78f80ea580 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Thomas Orgis <sobukus@sourcemage.org>
+ * INSTALL: install libiberty.h
+
2011-11-21 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.22
diff --git a/devel/binutils/INSTALL b/devel/binutils/INSTALL
index fe69cc0c3f..b805f678ba 100755
--- a/devel/binutils/INSTALL
+++ b/devel/binutils/INSTALL
@@ -1,3 +1,5 @@
make_single &&
-make DESTDIR=${INSTALL_ROOT} install &&
+make DESTDIR="$INSTALL_ROOT" install &&
+# other apps want to use the lib
+cp -v ../include/libiberty.h "$INSTALL_ROOT/usr/include" &&
make_normal
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index a5fdd374c9..b9ae433a0d 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.7.8.3
+ VERSION=1.7.8.4
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
- SOURCE_HASH=sha512:e2e4dc6d94b77ef74bf7e327fadb0b19494aa1d73acd9994b8c36471808dd80a5c2eb23065ae7f852a9269a45f5f6e311fe05a7ada2801966533e82891cd453a
+ SOURCE_HASH=sha512:d1ca22acd4a3d1b4b3b257fd2417d09df662865101a3d42bf6a22ae6f28053505124340ca129200e2c3bf1074a0ec9a245dbacf56c50301045010ef4530ebf23
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
- SOURCE3_HASH=sha512:5eca7e853d7ed21cf810c273e5f930f4cbc388c839773d974faeba07148272acfaea874f2c297e35a71e6ffb3612305ccc845a5155f180773354d0cb8ff00c7c
+ SOURCE3_HASH=sha512:d376d90e41139e896409f1631415f3528c5843452b2b9910257a3d121056d7071380ba556375c10c77be4eea7b8f6cf878d0702cc84215ff1c81f7e902f7717f
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
- SOURCE5_HASH=sha512:bef36c8f98921bdaf66fe4f7183b89c7153bf9bb2317989d70bcd85c6eb5ac232ce818b49f8db1a3e717bfa7d5ed407225b4819a56fced1b29eec586188ff07d
+ SOURCE5_HASH=sha512:d520a9b34920ffd844849e071575e80ddc9c911e12c77db6f9b8999ec8fc909eb4a9de882126453df574b84e38e3a537cb07b196760839bd264a910a428d25a7
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index bd06e3e306..a4c32e2107 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.7.8.4
+
2012-01-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.7.8.3
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index d21f5d9adb..2f4905233c 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -2,7 +2,6 @@ depends automake &&
depends gettext &&
depends gnupg &&
depends smgl-fhs &&
-depends lzo &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends autoconf &&
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 83c13e8e4d..039516800f 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -12,6 +12,7 @@
# SOURCE_IGNORE=volatile
#else
VERSION=1.99
+ PATCHLEVEL=1
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 8e6c388918..15140c00e9 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,13 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * fix-udev.patch: added
+ * PRE_BUILD: apply patch
+ fixes bug #341, pathc found by Eric Sandalle
+ /boot/grub/grub.cfg generated correctly with udev-179
+
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: lzo support was removed in 2009
+
2012-01-12 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: explicity disable device mapper/ LVM support
* BUILD: force -Os
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e6e8..3cd048f132 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -4,4 +4,5 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
else
rm -rf autom4te.cache
-fi
+fi &&
+patch -p0 <$SPELL_DIRECTORY/fix-udev.patch
diff --git a/disk/grub2/fix-udev.patch b/disk/grub2/fix-udev.patch
new file mode 100644
index 0000000000..fcfef34ef0
--- /dev/null
+++ b/disk/grub2/fix-udev.patch
@@ -0,0 +1,21 @@
+=== modified file 'grub-core/kern/emu/getroot.c'
+--- grub-core/kern/emu/getroot.c 2011-05-21 05:03:55 +0000
++++ grub-core/kern/emu/getroot.c 2011-05-30 23:56:40 +0000
+@@ -220,9 +220,17 @@ grub_find_root_device_from_mountinfo (co
+ /* Now scan visible mounts for the ones we're interested in. */
+ for (i = entry_len - 1; i >= 0; i--)
+ {
++ struct stat st;
++
+ if (!*entries[i].device)
+ continue;
+
++ if (stat (entries[i].device, &st) < 0)
++ /* The root filesystem device recorded in mountinfo does not
++ exist, perhaps due to a udev bug. Fall back to more primitive
++ methods. */
++ break;
++
+ ret = strdup (entries[i].device);
+ if (relroot)
+ *relroot = strdup (entries[i].enc_root);
diff --git a/disk/libewf/DETAILS b/disk/libewf/DETAILS
index f36f4231d7..5a61347d68 100755
--- a/disk/libewf/DETAILS
+++ b/disk/libewf/DETAILS
@@ -1,11 +1,10 @@
SPELL=libewf
- VERSION=20080501
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=20111015
+ SOURCE=$SPELL-beta-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://www.uitwisselplatform.nl/frs/download.php/529/$SOURCE
- SOURCE_HINTS[0]="no-check-certificate"
- SOURCE_HASH=sha512:1bb2404e26d439727df44ed22a1ad386086aea3734bf8ea1e4688aeff1a08eb4b4b5ff3e2eb2031ce2e87ca36a5ccbe51efa7e866c6e68c1f7465a0e4db348cc
- WEB_SITE=https://www.uitwisselplatform.nl/projects/libewf/
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:59a1e6533e0c8a8f16cb748f7970ca0879157d15bee1ecd2340ca0a46f81321f1b26885fafa9a440c01ab8a786a29f1b4857422cb9c1363ee4c796f299ef34da
+ WEB_SITE=http://sourceforge.net/projects/libewf/
LICENSE[0]=BSD
ENTERED=20070218
KEYWORDS="disk"
diff --git a/disk/libewf/HISTORY b/disk/libewf/HISTORY
index 23dc2e2621..953fb87392 100644
--- a/disk/libewf/HISTORY
+++ b/disk/libewf/HISTORY
@@ -1,3 +1,7 @@
+2012-01-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 20111015, SOURCE, SOURCE_URL[0] and WEB_SITE updated,
+ SOURCE_HINTS[0] removed
+
2009-02-16 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 20080501, http -> https, added SOURCE_HINTS[0]
* DOWNLOAD: removed
diff --git a/disk/nilfs-utils/DETAILS b/disk/nilfs-utils/DETAILS
index cb1b6bfd90..48df964a46 100755
--- a/disk/nilfs-utils/DETAILS
+++ b/disk/nilfs-utils/DETAILS
@@ -1,10 +1,10 @@
SPELL=nilfs-utils
- VERSION=2.1.0
+ VERSION=2.1.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.nilfs.org/download/$SOURCE
- SOURCE_HASH=sha512:b4e2c47b4745ff1f89cc7dc57c0754bd89503e6effbc6e55d93e8889c6e2cad12bae48f193fd9dae4f44b12876b03eca3f9daad0bbb0bf90d8d7704a6822f908
+ SOURCE_HASH=sha512:a56953350b2c3ce69096dacc7c4f7472dbd25779d74679226c7823ec93d180a4c84b34791da12ba461684ccb267ba2fb42dac4d6a5787044777f95dc22151ac6
WEB_SITE=http://www.nilfs.org/
ENTERED=20090603
LICENSE[0]=GPL
diff --git a/disk/nilfs-utils/HISTORY b/disk/nilfs-utils/HISTORY
index d4f12789a6..f592e207b9 100644
--- a/disk/nilfs-utils/HISTORY
+++ b/disk/nilfs-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.1.1
+
2011-12-25 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.1.0
diff --git a/disk/ntfs-3g/BUILD b/disk/ntfs-3g/BUILD
index 440db21686..56377fb8d6 100755
--- a/disk/ntfs-3g/BUILD
+++ b/disk/ntfs-3g/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} $NTFS3G_ACL $NTFS3G_MTAB" &&
+OPTS="$NTFS3G_ACL $NTFS3G_XATTR $NTFS3G_MTAB ${OPTS}" &&
default_build
diff --git a/disk/ntfs-3g/CONFIGURE b/disk/ntfs-3g/CONFIGURE
index 1406ca6648..5105f89a53 100755
--- a/disk/ntfs-3g/CONFIGURE
+++ b/disk/ntfs-3g/CONFIGURE
@@ -1,7 +1,11 @@
config_query_option NTFS3G_ACL 'Enable POSIX ACL support?' y \
'--enable-posix-acls' \
'--disable-posix-acls' &&
+
+config_query_option NTFS3G_XATTR "Enable system extended attributes mappings?" y \
+ "--enable-xattr-mappings" \
+ "--disable-xattr-mappings" &&
+
config_query_option NTFS3G_MTAB 'Enable usage of /etc/mtab ?' y \
'--enable-mtab' \
'--disable-mtab'
-
diff --git a/disk/ntfs-3g/DEPENDS b/disk/ntfs-3g/DEPENDS
index 1decb7a4ee..5668791703 100755
--- a/disk/ntfs-3g/DEPENDS
+++ b/disk/ntfs-3g/DEPENDS
@@ -1,5 +1,8 @@
-depends attr &&
-depends gnutls &&
+optional_depends gnutls \
+ "--enable-crypto" \
+ "--disable-crypto" \
+ "for crypto related code and utilities" &&
+
message 'If you want to allow normal users to mount ntfs filesystems,' &&
message 'then you need internal fuse support' &&
optional_depends fuse '--with-fuse=external' \
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 8435bb4c04..8d5b255bc4 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,9 +1,9 @@
SPELL=ntfs-3g
SPELLX=ntfs-3g_ntfsprogs
- VERSION=2011.4.12
- SOURCE_HASH=sha512:0bff1d39c84ce774e147dab0a8f7094bb7df8d7bd45a7a4d60ab25b230284ca67cd1746fbe2d063c080a346b40ea6a5960f1fbcae14468c30dcdc66639fc16d9
+ VERSION=2012.1.15
+ SOURCE_HASH=sha512:90dd894257f2ba683f1c6203e975288133bed2baae3d1c09087d5a1c93a1299cb0fd2099310c4d31e35463625a81ce49f9a69af3b9cd7223790d1cdd37e7a65e
SOURCE=$SPELLX-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.tuxera.com
SOURCE_URL[0]=$WEB_SITE/opensource/$SOURCE
LICENSE[0]=GPL
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 97c666dcf2..2cddf53665 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,12 @@
+2012-01-24 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2012.1.15
+
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: quoting paths
+ * DEPENDS: gnutls and is optional, attr isn't required
+ * CONFIGURE: xattr is configured here
+ * BUILD: use NTFS3G_XATTR; moved OPTS to the end
+
2011-04-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2011.4.12, ntfsprogs has been merged
* CONFLICTS: added
diff --git a/disk/sdparm/DETAILS b/disk/sdparm/DETAILS
index 939c796988..1ce0cc4d0a 100755
--- a/disk/sdparm/DETAILS
+++ b/disk/sdparm/DETAILS
@@ -1,6 +1,6 @@
SPELL=sdparm
- VERSION=1.06
- SOURCE_HASH=sha512:3a7cf14ac36c08a7af4d9967a78073557226f26333d1a20b793aece97c85027d44c6be856ee7e4bbdee53bb7c07d97bf35a4cd58979d98bbcf4cf22c12c2d3c8
+ VERSION=1.07
+ SOURCE_HASH=sha512:2ae898e8088e1a65c11987ec813128a0f6d74345b5e460ac6cb375844483e2991647671f2d3fadcc7d7b85256c64128db05e5a169b7dad8fb83cddc06fb0ee6c
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sdparm/HISTORY b/disk/sdparm/HISTORY
index b85858512e..b1a63c04db 100644
--- a/disk/sdparm/HISTORY
+++ b/disk/sdparm/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.07
+
2010-12-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.06
diff --git a/disk/sg3_utils/DETAILS b/disk/sg3_utils/DETAILS
index 4a46979e26..2ea654f3b9 100755
--- a/disk/sg3_utils/DETAILS
+++ b/disk/sg3_utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=sg3_utils
- VERSION=1.32
- SOURCE_HASH=sha512:99868cefd8d28313ac436cf067a60838d50287a76511ffffd9c2f944398992cc96747f7ecd6d311cde9d4aa27c1deccafc50e7a0304486a6a2ec45885af9fd19
+ VERSION=1.33
+ SOURCE_HASH=sha512:3973f91a0d9d28425ed9f9a01b1b17276914be9fd96c1314fcc49044478901bc885245bd1e8dcd3e86a271293d90efd2a66cb7746d0c0d1166ae82a7f3ae8c69
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sg3_utils/HISTORY b/disk/sg3_utils/HISTORY
index 95161fb125..abeb9ce542 100644
--- a/disk/sg3_utils/HISTORY
+++ b/disk/sg3_utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.33
+
2011-08-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.32
diff --git a/disk/xcdroast/DEPENDS b/disk/xcdroast/DEPENDS
index 122bbb3872..7d44e72f65 100755
--- a/disk/xcdroast/DEPENDS
+++ b/disk/xcdroast/DEPENDS
@@ -1,4 +1,4 @@
-depends cdrtools &&
+depends CD-BURN-UTILITY &&
if [ $XCDROAST_GTK2 == "y" ]; then
depends gtk+2
else
diff --git a/disk/xcdroast/HISTORY b/disk/xcdroast/HISTORY
index f81f87333d..aea93aa54f 100644
--- a/disk/xcdroast/HISTORY
+++ b/disk/xcdroast/HISTORY
@@ -1,3 +1,6 @@
+2012-01-24 Ismael Luceno <ismael.luceno@gmail.com>
+ * DEPENDS: depend on CD-BURN-UTILITY instead of cdrtools.
+
2007-02-14 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* PRE_BUILD: apply the mentioned patch
* modern_cdrtools.patch: added #13522
diff --git a/doc/docx2txt/DETAILS b/doc/docx2txt/DETAILS
index 8915e51098..4bff9847df 100755
--- a/doc/docx2txt/DETAILS
+++ b/doc/docx2txt/DETAILS
@@ -1,6 +1,6 @@
SPELL=docx2txt
- VERSION=1.0
- SOURCE_HASH=sha512:a7206ea209adf95b9ed468913713a37067fe4c4fd0ce6471b2178556c7492ea9f1664b62ad2fe9ae2e0048b0569081ad9d2272df7064d49c05ed535f7aa7f97d
+ VERSION=1.2
+ SOURCE_HASH=sha512:ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/docx2txt/HISTORY b/doc/docx2txt/HISTORY
index 16b716d4f2..67435cdfaf 100644
--- a/doc/docx2txt/HISTORY
+++ b/doc/docx2txt/HISTORY
@@ -1,3 +1,7 @@
+2012-01-16 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.2
+ * INSTALL: fix BINDIR
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/doc/docx2txt/INSTALL b/doc/docx2txt/INSTALL
index e747336c41..860f12c9de 100755
--- a/doc/docx2txt/INSTALL
+++ b/doc/docx2txt/INSTALL
@@ -1 +1 @@
-make INSTALLDIR=$INSTALL_ROOT/usr/bin install
+make BINDIR=$INSTALL_ROOT/usr/bin install
diff --git a/editors/focuswriter/BUILD b/editors/focuswriter/BUILD
new file mode 100755
index 0000000000..eec3de4651
--- /dev/null
+++ b/editors/focuswriter/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/editors/focuswriter/DEPENDS b/editors/focuswriter/DEPENDS
new file mode 100755
index 0000000000..1d42d0e572
--- /dev/null
+++ b/editors/focuswriter/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends qt4 &&
+depends hunspell &&
+depends libzip
diff --git a/editors/focuswriter/DETAILS b/editors/focuswriter/DETAILS
new file mode 100755
index 0000000000..8a75c4fa56
--- /dev/null
+++ b/editors/focuswriter/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=focuswriter
+ VERSION=1.3.5.2
+ SOURCE=${SPELL}-${VERSION}-src.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL=http://gottcode.org/focuswriter/focuswriter-1.3.5.2-src.tar.bz2
+ SOURCE_HASH=sha512:3dce6927ad5c7e8d521962d01d8c646393523e22a9e039aa8a44cb4d10f0fdd4f2858a25a1e108031ce3dd2168b761331f2679d4d4c63ee2f4b43ff843ed04d2
+ WEB_SITE=http://gottcode.org/focuswriter/
+ ENTERED=20120119
+ LICENSE[0]=GPL
+ SHORT="simple, distraction-free writing environment"
+cat << EOF
+FocusWriter is a simple, distraction-free writing environment.
+EOF
diff --git a/editors/focuswriter/HISTORY b/editors/focuswriter/HISTORY
new file mode 100644
index 0000000000..23f3153f7b
--- /dev/null
+++ b/editors/focuswriter/HISTORY
@@ -0,0 +1,2 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, BUILD: spell created, version 1.3.5.2
diff --git a/gnome2-apps/gthumb2/DETAILS b/gnome2-apps/gthumb2/DETAILS
index c378c1b70d..f3445179fa 100755
--- a/gnome2-apps/gthumb2/DETAILS
+++ b/gnome2-apps/gthumb2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gthumb2
- VERSION=2.14.1
+ VERSION=2.14.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gthumb-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gthumb-$VERSION
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index 1f7c2baaaf..3852f8e22e 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.14.2
+ * PRE_BUILD: removed
+
2012-01-13 Robin Cook <rcook@wyrms.net>
* DEPENDS: change unique to libunique
diff --git a/gnome2-apps/gthumb2/PRE_BUILD b/gnome2-apps/gthumb2/PRE_BUILD
deleted file mode 100755
index 6f545045d8..0000000000
--- a/gnome2-apps/gthumb2/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/gnome2-apps/gthumb2/gthumb-2.14.1.tar.xz.sig b/gnome2-apps/gthumb2/gthumb-2.14.1.tar.xz.sig
deleted file mode 100644
index 3bb3066abb..0000000000
--- a/gnome2-apps/gthumb2/gthumb-2.14.1.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/gthumb2/gthumb-2.14.2.tar.xz.sig b/gnome2-apps/gthumb2/gthumb-2.14.2.tar.xz.sig
new file mode 100644
index 0000000000..f61b8b97f5
--- /dev/null
+++ b/gnome2-apps/gthumb2/gthumb-2.14.2.tar.xz.sig
Binary files differ
diff --git a/gnome2-apps/vinagre/DEPENDS b/gnome2-apps/vinagre/DEPENDS
index 3982ae9dc9..3bc90e76ca 100755
--- a/gnome2-apps/vinagre/DEPENDS
+++ b/gnome2-apps/vinagre/DEPENDS
@@ -1,7 +1,7 @@
depends libxml2 &&
depends vala &&
depends gtk+3 &&
-depends gtk-vnc &&
+depends -sub 'GTK3' gtk-vnc &&
depends glib2 &&
depends gconf2 &&
depends gnome-doc-utils &&
diff --git a/gnome2-apps/vinagre/HISTORY b/gnome2-apps/vinagre/HISTORY
index 3a48e3a370..49593fb2c1 100644
--- a/gnome2-apps/vinagre/HISTORY
+++ b/gnome2-apps/vinagre/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Requires gtk-vnc built with gtk+3 bindings
+
2011-11-26 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 3.2.2
* DEPENDS: gtk+2 -> gtk+3
diff --git a/gnome2-libs/gjs/DETAILS b/gnome2-libs/gjs/DETAILS
index f598c58b77..2e1fdfc4e3 100755
--- a/gnome2-libs/gjs/DETAILS
+++ b/gnome2-libs/gjs/DETAILS
@@ -1,7 +1,7 @@
SPELL=gjs
- VERSION=1.30.0
+ VERSION=1.30.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/gnome2-libs/gjs/HISTORY b/gnome2-libs/gjs/HISTORY
index 30ce899276..a4d60cd592 100644
--- a/gnome2-libs/gjs/HISTORY
+++ b/gnome2-libs/gjs/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.30.1
+
2011-10-06 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.30.0
* DEPENDS: xulrunner removed
diff --git a/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig b/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig
deleted file mode 100644
index 30a7584e18..0000000000
--- a/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig b/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig
new file mode 100644
index 0000000000..b501cd228c
--- /dev/null
+++ b/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index 43698effa7..eee1bd6123 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -13,7 +13,8 @@ if [[ $LIBSOUP_GNOME == "y" ]]; then
fi &&
if [[ $LIBSOUP_DEVEL == "y" ]]; then
-depends glib-networking
+ sub_depends glib2 'GLIB_DEVEL' &&
+ depends glib-networking
else
optional_depends gnutls \
"--enable-ssl" \
diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index c65539d3ec..4966bb5496 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,11 +1,12 @@
SPELL=libsoup
if [[ $LIBSOUP_DEVEL == y ]]; then
- VERSION=2.36.1
+ VERSION=2.37.3
+ SOURCE=$SPELL-$VERSION.tar.xz
else
VERSION=2.36.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 7d07c6653b..1585fd5eee 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,9 @@
+2012-01-18 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Devel libsoup requires devel glib2
+
+2012-01-11 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: devel version 2.37.3
+
2011-10-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.36.1
diff --git a/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
new file mode 100644
index 0000000000..19e4da3412
--- /dev/null
+++ b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/mutter/DETAILS b/gnome2-libs/mutter/DETAILS
index d7d4f1391c..0f10cd2716 100755
--- a/gnome2-libs/mutter/DETAILS
+++ b/gnome2-libs/mutter/DETAILS
@@ -1,7 +1,7 @@
SPELL=mutter
- VERSION=3.2.1
+ VERSION=3.2.2
BRANCH=${VERSION:0:3}
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/gnome2-libs/mutter/HISTORY b/gnome2-libs/mutter/HISTORY
index 23e855f692..d3ebdb9d80 100644
--- a/gnome2-libs/mutter/HISTORY
+++ b/gnome2-libs/mutter/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2, bz2 -> xz
+
2011-11-09 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Merged two optional dependencies on libxext
diff --git a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig b/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig
deleted file mode 100644
index e6e629857f..0000000000
--- a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig
new file mode 100644
index 0000000000..8c2eff4428
--- /dev/null
+++ b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig
Binary files differ
diff --git a/gnome3-apps/gnome-color-manager/DETAILS b/gnome3-apps/gnome-color-manager/DETAILS
index 6ff6299cf8..27393dea47 100755
--- a/gnome3-apps/gnome-color-manager/DETAILS
+++ b/gnome3-apps/gnome-color-manager/DETAILS
@@ -1,7 +1,7 @@
SPELL=gnome-color-manager
- VERSION=3.2.0
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome3-apps/gnome-color-manager/HISTORY b/gnome3-apps/gnome-color-manager/HISTORY
index 0308e962b2..43b8888894 100644
--- a/gnome3-apps/gnome-color-manager/HISTORY
+++ b/gnome3-apps/gnome-color-manager/HISTORY
@@ -1,2 +1,5 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2
+
2011-10-06 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 3.2.0
diff --git a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig
deleted file mode 100644
index 6f9a213d55..0000000000
--- a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig
new file mode 100644
index 0000000000..1caf282578
--- /dev/null
+++ b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig
Binary files differ
diff --git a/gnome3-libs/gnome-shell/DETAILS b/gnome3-libs/gnome-shell/DETAILS
index 41cb1305dd..e83ecf7901 100755
--- a/gnome3-libs/gnome-shell/DETAILS
+++ b/gnome3-libs/gnome-shell/DETAILS
@@ -1,7 +1,7 @@
SPELL=gnome-shell
- VERSION=3.2.1
+ VERSION=3.2.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome3-libs/gnome-shell/HISTORY b/gnome3-libs/gnome-shell/HISTORY
index 65a153a120..d3e529437c 100644
--- a/gnome3-libs/gnome-shell/HISTORY
+++ b/gnome3-libs/gnome-shell/HISTORY
@@ -1,3 +1,9 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2.1
+
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2, bz2 -> xz
+
2011-12-14 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: pulseaudio added
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig
deleted file mode 100644
index a1ad193f99..0000000000
--- a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
new file mode 100644
index 0000000000..65943e7b0d
--- /dev/null
+++ b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
Binary files differ
diff --git a/graphics-libs/fop/DETAILS b/graphics-libs/fop/DETAILS
index b5772b849d..8419516499 100755
--- a/graphics-libs/fop/DETAILS
+++ b/graphics-libs/fop/DETAILS
@@ -1,9 +1,9 @@
SPELL=fop
- VERSION=0.20.5
+ VERSION=1.0
SOURCE=${SPELL}-${VERSION}-src.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL=${APACHE_URL}/xml/fop/${SOURCE}
+ SOURCE_URL=${APACHE_URL}/xmlgraphics/fop/${SOURCE}
SOURCE2_URL=${SOURCE_URL}.asc
SOURCE_GPG=fop.gpg:${SOURCE}.asc:UPSTREAM_KEY
SOURCE2_IGNORE=SIGNATURE
diff --git a/graphics-libs/fop/HISTORY b/graphics-libs/fop/HISTORY
index 4af99d5f16..7c9ae83653 100644
--- a/graphics-libs/fop/HISTORY
+++ b/graphics-libs/fop/HISTORY
@@ -1,3 +1,6 @@
+2012-01-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/graphics-libs/fop/fop.gpg b/graphics-libs/fop/fop.gpg
index f0f939c67c..08b78c476b 100644
--- a/graphics-libs/fop/fop.gpg
+++ b/graphics-libs/fop/fop.gpg
Binary files differ
diff --git a/graphics-libs/freeglut/DETAILS b/graphics-libs/freeglut/DETAILS
index b02ee8fbc1..dc4c4832e3 100755
--- a/graphics-libs/freeglut/DETAILS
+++ b/graphics-libs/freeglut/DETAILS
@@ -1,6 +1,6 @@
SPELL=freeglut
- VERSION=2.6.0
- SOURCE_HASH=sha512:685d55979c1fb420593d4b9f8d01ba9853288df0c3df9fa60ed9c4dfcb469dcf6c3142a9306073fac9e75fde1fb81ace325d6a9eebce227d95220e82217fda26
+ VERSION=2.8.0
+ SOURCE_HASH=sha512:ae2918d1ed7370ba3345f6416f70678cdf2346f61ce118102dc449d365163fcf238b76474178f57687592dacf41657b064e588e378c562ce878e92eaed17a665
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION/-rc*/}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index 20a312039e..cf4e7d2412 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.8.0
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/graphics-libs/libvisio/DETAILS b/graphics-libs/libvisio/DETAILS
index 982ad52ff7..1f2be4b248 100755
--- a/graphics-libs/libvisio/DETAILS
+++ b/graphics-libs/libvisio/DETAILS
@@ -1,6 +1,6 @@
SPELL=libvisio
- VERSION=0.0.12
- SOURCE_HASH=sha512:f60595a2d34b81d80d571173f91ad833da864deb5ea7ffe8a95dd59a1b33fb54a28c355c6809c43304d8761ecb4ff2e24bc3b2a6d25ff982118f82c344379a7d
+ VERSION=0.0.13
+ SOURCE_HASH=sha512:cc03e384c9b30a54b17f1ced3d15695c5d4ae146ac83f66c7d28afd99ec6cb83c7490e939d567590ab83372637ce7c00614f2ebca03fe5a2ac9d2b0f7b1df169
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/libvisio/HISTORY b/graphics-libs/libvisio/HISTORY
index 433a043073..e8b6935c44 100644
--- a/graphics-libs/libvisio/HISTORY
+++ b/graphics-libs/libvisio/HISTORY
@@ -1,2 +1,5 @@
-2011-01-12 Ladislav Hagara <hgr@vabo.cz>
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.0.13
+
+2012-01-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS: spell created, version 0.0.12
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index de8c5328b2..568ae5543f 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.18.2
- SOURCE_HASH=sha512:49bcf54fd93e0a6db0090bf3d01143673ff260b8b1b295a72a9924f694ea6fd83889d70958cdff61bddd57d64f0b7634971613b1167c8f52bc560aff23aa0763
+ VERSION=0.18.3
+ SOURCE_HASH=sha512:90b4b4a735bb190da073488b2e3dde358c404245a43c1c4fb6406d832d565d23470a77861e42cf99f858c89121000fe453b04f92440f9c7e026daca45e037550
else
- VERSION=0.18.2
- SOURCE_HASH=sha512:49bcf54fd93e0a6db0090bf3d01143673ff260b8b1b295a72a9924f694ea6fd83889d70958cdff61bddd57d64f0b7634971613b1167c8f52bc560aff23aa0763
+ VERSION=0.18.3
+ SOURCE_HASH=sha512:90b4b4a735bb190da073488b2e3dde358c404245a43c1c4fb6406d832d565d23470a77861e42cf99f858c89121000fe453b04f92440f9c7e026daca45e037550
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 2979342940..370d48c910 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.18.3
+
2011-12-25 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added missing optional dependency
diff --git a/graphics/darktable/BUILD b/graphics/darktable/BUILD
new file mode 100755
index 0000000000..131a11ce3c
--- /dev/null
+++ b/graphics/darktable/BUILD
@@ -0,0 +1,7 @@
+OPTS+=" -DCMAKE_BUILD_TYPE=Release" &&
+OPTS+=" -DDONT_INSTALL_GCONF_SCHEMAS=1" &&
+OPTS+=" -DINSTALL_IOP_LEGACY=1" &&
+OPTS+=" -DINSTALL_IOP_EXPERIMENTAL=1" &&
+OPTS+=" -DBINARY_PACKAGE_BUILD=1" &&
+CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations" \
+ CXXFLAGS="${CXXFLAGS} -Wno-error=deprecated-declarations" cmake_build
diff --git a/graphics/darktable/DEPENDS b/graphics/darktable/DEPENDS
new file mode 100755
index 0000000000..46861e52bb
--- /dev/null
+++ b/graphics/darktable/DEPENDS
@@ -0,0 +1,18 @@
+depends cairo &&
+depends cmake &&
+depends curl &&
+depends dbus-glib &&
+depends exiv2 &&
+depends fop &&
+depends gconf2 &&
+depends glade2 &&
+depends gphoto2 &&
+depends gtk+2 &&
+depends JPEG &&
+depends lcms2 &&
+depends libpng &&
+depends libraw &&
+depends openexr &&
+depends sqlite &&
+depends tiff &&
+optional_depends gnome-keyring "-DUSE_GNOME_KEYRING=ON" "-DUSE_GNOME_KEYRING=OFF" "build gnome-keyring password storage backend"
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
new file mode 100755
index 0000000000..7e4c9d860d
--- /dev/null
+++ b/graphics/darktable/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=darktable
+ VERSION=0.9.3
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/0.9/${SOURCE}
+ SOURCE_HASH=sha512:0b4b978090aecca3cece8bbadf5e1c3f82f9e1e859eecb8e593d9032347d0fc11b772bcf80074cef513b7a0e88393506c5c5dfbbf57d52a0a21ab338fcd52472
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.darktable.org"
+ LICENSE[0]=GPL
+ ENTERED=20120121
+ SHORT="an open source photography workflow application and RAW developer"
+cat << EOF
+darktable is an open source photography workflow application and RAW developer.
+A virtual lighttable and darkroom for photographers. It manages your digital
+negatives in a database, lets you view them through a zoomable lighttable
+and enables you to develop raw images and enhance them.
+EOF
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
new file mode 100644
index 0000000000..cb40021a53
--- /dev/null
+++ b/graphics/darktable/HISTORY
@@ -0,0 +1,3 @@
+2012-01-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/graphics/mypaint/DETAILS b/graphics/mypaint/DETAILS
index 9e245c5a85..68d547bae1 100755
--- a/graphics/mypaint/DETAILS
+++ b/graphics/mypaint/DETAILS
@@ -11,10 +11,10 @@ if [[ $MYPAINT_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION=0.9.1
+ VERSION=1.0.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://download.gna.org/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:81bbd8f272c2c98154bb65bf3709e81cda3a74e20427e8433d34f12ca56082844451d1412af0444696f6a9d5f26bbcbae6ae0199668130931551916b3238cca3
+ SOURCE_HASH=sha512:91434f6d352d4f5dde3d919772a678a17f15a6d2914fb2377b40e4a0fea042e3c96b5618e1864eacdbfa52f449be03062da2ecb8ec08bae168e3a12904047bf2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://mypaint.intilinux.com/"
diff --git a/graphics/mypaint/HISTORY b/graphics/mypaint/HISTORY
index 07a6b3afb7..8511368649 100644
--- a/graphics/mypaint/HISTORY
+++ b/graphics/mypaint/HISTORY
@@ -1,3 +1,6 @@
+2012-01-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.0
+
2011-10-12 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: add scm version
diff --git a/groups b/groups
index d65f43d7e9..25464466a8 100755
--- a/groups
+++ b/groups
@@ -116,5 +116,6 @@ dspam:188:
nslcd:189:
redis:190:
lightdm:191:
+masqmail:192:
users:1000:
nogroup:65534:
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 66f43a0bdd..796824aade 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -10,7 +10,7 @@ depends JPEG &&
depends bison &&
depends flex &&
depends sqlite &&
-depends -sub SOUP_DEVEL libsoup
+depends libsoup &&
depends enchant &&
depends libxt &&
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index eef4e0a024..1f4420b19d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: libsoup is up to date enough to be used as stable
+
2011-09-29 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.1
* BUILD: --with-gtk=2.0 added
diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
index 36750653e5..2a68c3a5f9 100755
--- a/kernels/kmod/DETAILS
+++ b/kernels/kmod/DETAILS
@@ -1,15 +1,15 @@
SPELL=kmod
- VERSION=3
-# SOURCE_HASH=sha512:
+ VERSION=4
+ SOURCE_HASH=sha512:5f1db9ecdd90da39a99c256e4cc6740da8ee19351652325538b40c731d073fb277312541ab8969ea7caf777c45ea97202e07ac13268111e322fcd3fe8a875189
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE2=$SOURCE.sign
+# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://packages.profusion.mobi/kmod/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
- SOURCE_GPG=lucas.demarchi.gpg:$SOURCE.sign:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
+# SOURCE_GPG=lucas.demarchi.gpg:$SOURCE.sign:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
-#WEB_SITE=
+ WEB_SITE=http://git.profusion.mobi/cgit.cgi/kmod.git
LICENSE[0]=GPL
ENTERED=20120113
KEYWORDS=""
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
index b483ba25de..d856fc2b92 100644
--- a/kernels/kmod/HISTORY
+++ b/kernels/kmod/HISTORY
@@ -1,3 +1,7 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 4
+ * PRE_BUILD: removed
+
2012-01-13 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3
using key 30CBEA53: public key "Lucas De Marchi <lucas.demarchi@profusion.mobi>"
diff --git a/kernels/kmod/PRE_BUILD b/kernels/kmod/PRE_BUILD
deleted file mode 100755
index 089ae35ddc..0000000000
--- a/kernels/kmod/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-cd $BUILD_DIRECTORY &&
-# special case for xz tarballs
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 4814ee6036..0e2e73cf10 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.2.2
+ * info/patches/maintenance_patches_3/patch-3.2.2: added
+
2012-01-13 Ladislav Hagara <hgr@vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.2.1
* info/patches/maintenance_patches_3/patch-3.2.1: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
new file mode 100755
index 0000000000..f1e0c50044
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="9e503b4f6d00fa65a3da472373f5c0f2072b6a64"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index a7c0e2ea5e..dad1ff7edb 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.2
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.2.1
+LATEST_maintenance_patches_3=patch-3.2.2
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/jansson/DETAILS b/libs/jansson/DETAILS
new file mode 100755
index 0000000000..c062a4b6b5
--- /dev/null
+++ b/libs/jansson/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=jansson
+ VERSION=2.2.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://www.digip.org/${SPELL}/releases/${SOURCE}
+ SOURCE_HASH=sha512:bb5ba0dc658a3a88c02c8e3a12fa1191e9d53c1944174edf6ff95fd91b41667047b2eb8db7ca83e9af5fcad62aa81bb8bac91d2084c326d826e69ecda8fad994
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.digip.org/jansson/"
+ LICENSE[0]=MIT
+ ENTERED=20120121
+ SHORT="a C library for encoding, decoding and manipulating JSON data"
+cat << EOF
+Jansson is a C library for encoding, decoding and manipulating JSON data. It
+features:
+
+ * Simple and intuitive API and data model * Comprehensive documentation
+ * No dependencies on other libraries * Full Unicode support (UTF-8) *
+ Extensive test suite
+EOF
diff --git a/libs/jansson/HISTORY b/libs/jansson/HISTORY
new file mode 100644
index 0000000000..688f171454
--- /dev/null
+++ b/libs/jansson/HISTORY
@@ -0,0 +1,3 @@
+2012-01-21 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: spell created
+
diff --git a/libs/libgksu/BUILD b/libs/libgksu/BUILD
new file mode 100755
index 0000000000..f9d60da3af
--- /dev/null
+++ b/libs/libgksu/BUILD
@@ -0,0 +1,3 @@
+LDFLAGS="-lgtk-x11-2.0 $LDFLAGS" &&
+
+default_build
diff --git a/libs/libgksu/HISTORY b/libs/libgksu/HISTORY
index 139ee6500d..3019187916 100644
--- a/libs/libgksu/HISTORY
+++ b/libs/libgksu/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * BUILD: added, to fix linking with recent gtk+2
+ * PRE_BUILD: apply the patch
+ * forkpty.patch: added, to fix work with recent sudo
+
2011-03-10 Eric Sandall <sandalle@sourcemage.org>
* PRE_BUILD: Apply make.tab.patch
* make.tab.patch: Fix spaces -> tabs in Makefile.{in,am}
diff --git a/libs/libgksu/PRE_BUILD b/libs/libgksu/PRE_BUILD
index ae31f41ee8..dd7e857096 100755
--- a/libs/libgksu/PRE_BUILD
+++ b/libs/libgksu/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY"/forkpty.patch &&
patch -p1 < "$SPELL_DIRECTORY"/make.tab.patch
diff --git a/libs/libgksu/forkpty.patch b/libs/libgksu/forkpty.patch
new file mode 100644
index 0000000000..14113f9ec5
--- /dev/null
+++ b/libs/libgksu/forkpty.patch
@@ -0,0 +1,358 @@
+--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400
++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+ * Gksu -- a library providing access to su functionality
+ * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+ for (i = 0 ; cmd[i] != NULL ; i++)
+ g_free (cmd[i]);
+ g_free(cmd);
+-
+- _exit(1);
+ }
+ else if (pid == -1)
+ {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+ /* drop the \n echoed on password entry if su did request
+ a password */
+ if (password_needed)
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+ }
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+ {
+ int retval = 0;
+
+- /* Red Hat's su shows the full path to su in its error messages. */
+- if (!strncmp (buf, "su:", 3) ||
+- !strncmp (buf, "/bin/su:", 7))
++ if (!strncmp (buf, "su", 2))
+ {
+ gchar **strings;
+
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+ }
+
+ strings = g_strsplit (buf, ":", 2);
+-
+- /* Red Hat and Fedora use 'incorrect password'. */
+- if (strings[1] &&
+- (g_str_has_prefix(strings[1], " Authentication failure") ||
+- g_str_has_prefix(strings[1], " incorrect password")))
++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
+ {
+ if (used_gnome_keyring)
+ g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+ char **cmd;
+ char buffer[256] = {0};
+- char *child_stderr = NULL;
+- /* This command is used to gain a token */
+- char *const verifycmd[] =
+- {
+- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+- };
+ int argcount = 8;
+ int i, j;
+
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+
+ pid_t pid;
+ int status;
+- FILE *fdfile = NULL;
+- int fdpty = -1;
++ FILE *infile, *outfile;
++ int parent_pipe[2]; /* For talking to the parent */
++ int child_pipe[2]; /* For talking to the child */
+
+ context->sudo_mode = TRUE;
+
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+ cmd[argcount] = g_strdup("-S");
+ argcount++;
+
+- /* Make sudo noninteractive (we should already have a token) */
+- cmd[argcount] = g_strdup("-n");
+- argcount++;
+-
+ /* Make sudo use next arg as prompt */
+ cmd[argcount] = g_strdup("-p");
+ argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+ }
+
+- pid = forkpty(&fdpty, NULL, NULL, NULL);
+- if (pid == 0)
++ if ((pipe(parent_pipe)) == -1)
+ {
+- // Child
+- setsid(); // make us session leader
+-
+- execv(verifycmd[0], verifycmd);
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+- _("Failed to exec new process: %s"),
++ if ((pipe(child_pipe)) == -1)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
+ strerror(errno));
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
+- else if (pid == -1)
++
++ pid = fork();
++ if (pid == -1)
+ {
+ g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+ _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
++ else if (pid == 0)
++ {
++ // Child
++ setsid(); // make us session leader
++ close(child_pipe[1]);
++ dup2(child_pipe[0], STDIN_FILENO);
++ dup2(parent_pipe[1], STDERR_FILENO);
+
++ execv(cmd[0], cmd);
++
++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++ _("Failed to exec new process: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+ else
+ {
+ gint counter = 0;
+ gchar *cmdline = NULL;
+- struct termios tio;
+
+ // Parent
+- fdfile = fdopen(fdpty, "w+");
++ close(parent_pipe[1]);
+
+- /* make sure we notice that ECHO is turned off, if it gets
+- turned off */
+- tcgetattr (fdpty, &tio);
+- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+- {
+- usleep (1000);
+- tcgetattr (fdpty, &tio);
+- }
++ infile = fdopen(parent_pipe[0], "r");
++ if (!infile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- fcntl (fdpty, F_SETFL, O_NONBLOCK);
++ outfile = fdopen(child_pipe[1], "w");
++ if (!outfile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
++
++ /*
++ we are expecting to receive a GNOME_SUDO_PASS
++ if we don't there are two possibilities: an error
++ or a password is not needed
++ */
++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+
+ { /* no matter if we can read, since we're using
+ O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+ struct timeval tv;
+
+ FD_ZERO(&rfds);
+- FD_SET(fdpty, &rfds);
++ FD_SET(parent_pipe[0], &rfds);
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
+
+- select (fdpty + 1, &rfds, NULL, NULL, &tv);
++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+ }
+
+ /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+ if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+ break;
+
+- read_line (fdpty, buffer, 256);
++ read_line (parent_pipe[0], buffer, 256);
+
+ if (context->debug)
+ fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+
+ usleep (1000);
+
+- write (fdpty, password, strlen(password) + 1);
+- write (fdpty, "\n", 1);
++ fprintf (outfile, "%s\n", password);
++ fclose (outfile);
+
+ nullify_password (password);
+
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ /* turn NONBLOCK off */
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ /* ignore the first newline that comes right after sudo receives
+ the password */
+- fgets (buffer, 255, fdfile);
+- /* this is the status we are interested in */
+- fgets (buffer, 255, fdfile);
++ fgets (buffer, 255, infile);
++ /* this is the status we are interessted in */
++ fgets (buffer, 255, infile);
+ }
+ else
+ {
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
+
+ /* turn NONBLOCK off, also if have no prompt */
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+
+ should_display = gconf_client_get_bool (context->gconf_client,
+ BASE_PATH "display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "%s", buffer);
+ }
+
+- if (g_str_has_prefix (buffer, "Sorry, try again."))
++ if (!strcmp (buffer, "Sorry, try again.\n"))
+ g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+ _("Wrong password."));
++ else if (!strncmp (buffer, "Sorry, user ", 12))
++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++ _("The underlying authorization mechanism (sudo) "
++ "does not allow you to run this program. Contact "
++ "the system administrator."));
+ else
+ {
+ gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- /* If we have an error, let's just stop sudo right there. */
+- if (error)
+- close(fdpty);
+-
+ cmdline = g_strdup("sudo");
+ /* wait for the child process to end or become something other
+ than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+ if (context->sn_context)
+ gksu_context_launch_complete (context);
+
++ while (read (parent_pipe[0], buffer, 255) > 0)
++ {
++ fprintf (stderr, "%s", buffer);
++ bzero(buffer, 256);
++ }
++
+ /* if the process is still active waitpid() on it */
+ if (pid_exited != pid)
+ waitpid(pid, &status, 0);
+ sudo_reset_xauth (context, xauth, xauth_env);
+
+- /*
+- * Did token acquisition succeed? If so, spawn sudo in
+- * non-interactive mode. It should either succeed or die
+- * immediately if you're not allowed to run the command.
+- */
+- if (WEXITSTATUS(status) == 0)
+- {
+- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+- NULL, &child_stderr, &status,
+- error);
+- }
+-
+ if (exit_status)
+ {
+ if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+
+ if (WEXITSTATUS(status))
+ {
+- if (g_str_has_prefix(child_stderr, "Sorry, user "))
+- {
+- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+- _("The underlying authorization mechanism (sudo) "
+- "does not allow you to run this program. Contact "
+- "the system administrator."));
+- }
+ if(cmdline)
+ {
+ /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+ if (!g_str_has_suffix (cmdline, "sudo"))
+ {
+ g_free (cmdline);
+- g_free (child_stderr);
+ return FALSE;
+ }
+ g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- fprintf(stderr, child_stderr);
+- g_free(child_stderr);
+-
+ /* if error is set we have found an error condition */
+- return (error == NULL);
++ if (error)
++ return FALSE;
++
++ return TRUE;
+ }
+
+ /**
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 097f83db58..357757b700 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,5 +1,5 @@
SPELL=libidn
- VERSION=1.22
+ VERSION=1.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index e657632183..7a6816ffff 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.24
+
2011-05-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.22
diff --git a/libs/libnih/DETAILS b/libs/libnih/DETAILS
index 6dfd4f3453..991dabe98c 100755
--- a/libs/libnih/DETAILS
+++ b/libs/libnih/DETAILS
@@ -1,9 +1,9 @@
SPELL=libnih
- VERSION=1.0.2.orig
- SOURCE="${SPELL}_${VERSION}.tar.gz"
- SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/main/libn/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:d13f46dc2e449d8864a39e1b71747e419b8d262d3c8ce7f555569208e3b72c5e74550d05336036794cc9debec52fec03eb7e9544b7bd93f37691048d0e52ad6c
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.2"
+ VERSION=1.0.3
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]="http://launchpad.net/${SPELL}/${VERSION:0:3}/${VERSION}/+download/${SOURCE}"
+ SOURCE_HASH=sha512:fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/libnih"
LICENSE[0]=GPL
ENTERED=20101114
diff --git a/libs/libnih/HISTORY b/libs/libnih/HISTORY
index f98a20a719..7cb036971d 100644
--- a/libs/libnih/HISTORY
+++ b/libs/libnih/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.0.3
+
2010-11-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/libs/libnl/DETAILS b/libs/libnl/DETAILS
index 585e34d2fb..7e0c25613c 100755
--- a/libs/libnl/DETAILS
+++ b/libs/libnl/DETAILS
@@ -1,9 +1,9 @@
SPELL=libnl
- VERSION=3.2.3
- SOURCE_HASH=sha512:43b1140f92c920536e526f137a6f6cb1ea3b28090b1f7094724e3875c6ad7de1db66278f653aea3547f92ca452bc8d2bbcdbfb4312c615aa93de78a49fcdc8c3
+ VERSION=3.2.7
+ SOURCE_HASH=sha512:be060ca030a83869575e22761b106e206c9545be92c18e61f09dce99476237ea71ebfb777ebb7ee17da6a2e3886fdfd30ae1fc6b37b775ba6a74cdd79568d1f3
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://people.suug.ch/~tgr/libnl/files/$SOURCE
LICENSE[0]=LGPL
KEYWORDS="network libs"
diff --git a/libs/libnl/HISTORY b/libs/libnl/HISTORY
index 570fb8af29..8237df5401 100644
--- a/libs/libnl/HISTORY
+++ b/libs/libnl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-27 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.2.7; quoting paths
+ * libnl-1.pc -> libnl-3.pc
+
2011-12-22 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.2.3
* libnl: deleted
diff --git a/libs/libnl/libnl-1.pc b/libs/libnl/libnl-3.pc
index aa12401a5d..7647e8255b 100644
--- a/libs/libnl/libnl-1.pc
+++ b/libs/libnl/libnl-3.pc
@@ -6,6 +6,6 @@ sysconfdir=/etc
Name: libnl
Description: Netlink socket library
-Version: 1.0-pre5
+Version: 3.2.7
Libs: -L${libdir} -lnl
Cflags: -I${includedir}/netlink
diff --git a/libs/orc/DETAILS b/libs/orc/DETAILS
index 45683299b8..f5f65451ef 100755
--- a/libs/orc/DETAILS
+++ b/libs/orc/DETAILS
@@ -1,6 +1,6 @@
SPELL=orc
- VERSION=0.4.14
- SOURCE_HASH=sha512:961d71caeff340ac3d98aedad398f7f87eaf7d41a7c136a14a15a7ef3713bbd109ce35642e4f8275ceb9bff2796288bf85b5bd183a4dac600f0ba8f8e8ef9fb6
+ VERSION=0.4.16
+ SOURCE_HASH=sha512:e9d3c4e8682119253c201addcd2cb623a61e45d7cb8b0b406a3509f1a9443af9375a418a68f832d29af4a523cd91bf702bdd002cf143be0f7cc9f5a0b77f7ae0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://code.entropywave.com/download/orc/$SOURCE
diff --git a/libs/orc/HISTORY b/libs/orc/HISTORY
index 1a680c294d..037c08ed2c 100644
--- a/libs/orc/HISTORY
+++ b/libs/orc/HISTORY
@@ -1,3 +1,6 @@
+2012-01-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.4.16
+
2011-05-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.4.14
diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD
index 8789da5405..8ce5b4bfe6 100755
--- a/libs/pcre/BUILD
+++ b/libs/pcre/BUILD
@@ -1,3 +1,4 @@
+OPTS+=" --disable-static $JIT" &&
if [[ $BUILDUTF8 == y ]]; then
OPTS="$OPTS --enable-utf8"
if [[ $UTFPROPERTIES == y ]]; then
diff --git a/libs/pcre/CONFIGURE b/libs/pcre/CONFIGURE
index 1ef609c095..d6ed96af32 100755
--- a/libs/pcre/CONFIGURE
+++ b/libs/pcre/CONFIGURE
@@ -3,3 +3,4 @@ config_query BUILDUTF8 "Enable UTF-8 support?" y
if [[ $BUILDUTF8 == y ]]; then
config_query UTFPROPERTIES "Enable UTF-8 properties?" n
fi
+config_query_option JIT "Enable JustInTime support" y "--enable-jit" ""
diff --git a/libs/pcre/DEPENDS b/libs/pcre/DEPENDS
index de7aa73917..88e0049d5f 100755
--- a/libs/pcre/DEPENDS
+++ b/libs/pcre/DEPENDS
@@ -1,5 +1,18 @@
depends gnupg &&
depends smgl-fhs &&
+optional_depends zlib \
+ '--enable-pcregrep-libz' \
+ '' \
+ 'handle .gz files in pcregrep' &&
+
+optional_depends bzip2 \
+ '--enable-pcregrep-libbz2' \
+ '' 'handle .bz2 files in pcregrep' &&
+
+optional_depends readline \
+ '--enable-pcretest-libreadline' \
+ '' \
+ 'use system readline' &&
optional_depends -sub CXX gcc \
"--enable-cpp" \
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index f21e49dbbe..b9a1a51978 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,8 @@
+2012-01-27 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: add zlib, bzip2, readline
+ * BUILD: disable-static
+ * CONFIGURE: allow JIT support
+
2011-12-13 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 8.21
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index d60101b952..36fa790a71 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,4 +1,5 @@
conflicts courier-imap &&
+conflicts masqmail &&
conflicts esmtp &&
conflicts exim &&
conflicts postfix &&
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 8bbee30899..496ca4e901 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-03-27 Remko van der Vossen <wich@sourcemage.org>
* DETAILS: version 0.65.3
* init.d/*: simplified and use smgl_init (working NEEDS)
diff --git a/mail/esmtp/CONFLICTS b/mail/esmtp/CONFLICTS
index 3ae5540f6b..6482df0138 100755
--- a/mail/esmtp/CONFLICTS
+++ b/mail/esmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts exim &&
conflicts postfix &&
diff --git a/mail/esmtp/HISTORY b/mail/esmtp/HISTORY
index 3060a7cb8b..7862f87b3b 100644
--- a/mail/esmtp/HISTORY
+++ b/mail/esmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-23 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.2
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index 91e224b3f3..d8f360d343 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
conflicts postfix &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 902294025a..3d9d4dd608 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.77; SECURITY_PATCH++
diff --git a/mail/masqmail/BUILD b/mail/masqmail/BUILD
new file mode 100755
index 0000000000..be4c244b30
--- /dev/null
+++ b/mail/masqmail/BUILD
@@ -0,0 +1,10 @@
+create_account masqmail &&
+create_account mail &&
+
+OPTS="--with-user=masqmail \
+ --with-group=masqmail \
+ --with-spooldir=$INSTALL_ROOT/var/spool/mail \
+ $MASQMAIL_OPTS \
+ $OPTS" &&
+
+default_build
diff --git a/mail/masqmail/CONFIGURE b/mail/masqmail/CONFIGURE
new file mode 100755
index 0000000000..e203269f93
--- /dev/null
+++ b/mail/masqmail/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option MASQMAIL_OPTS "Enable resolver support?" y \
+ "--enable-resolver" \
+ "--disable-resolver" &&
+
+config_query_option MASQMAIL_OPTS "Enable AUTH (RFC 2554) client support?" y \
+ "--enable-auth" \
+ "--disable-auth" &&
+
+config_query_option MASQMAIL_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS
new file mode 100755
index 0000000000..a1641aa7e3
--- /dev/null
+++ b/mail/masqmail/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts exim &&
+conflicts courier &&
+conflicts esmtp &&
+conflicts postfix &&
+conflicts sendmail &&
+conflicts netqmail
diff --git a/mail/masqmail/DEPENDS b/mail/masqmail/DEPENDS
new file mode 100755
index 0000000000..dad78f04a9
--- /dev/null
+++ b/mail/masqmail/DEPENDS
@@ -0,0 +1,6 @@
+depends glib2 &&
+
+optional_depends liblockfile \
+ "--with-liblockfile" \
+ "--without-liblockfile" \
+ "to use liblock"
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
new file mode 100755
index 0000000000..aab8643033
--- /dev/null
+++ b/mail/masqmail/DETAILS
@@ -0,0 +1,47 @@
+ SPELL=masqmail
+ VERSION=0.3.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=masqmail.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]=GPL
+ WEB_SITE=http://marmaro.de/prog/masqmail/
+ ENTERED=20120119
+ SHORT="MTA for workstations and for servers in small networks"
+cat << EOF
+Masqmail is a mail server designed for hosts that are not permanently connected
+to the Internet. It handles outgoing messages, i.e. those that are to be sent
+over the non-permanent link (usually a ppp or slip connection over a modem or
+ISDN adapter) specially and delivers them only when explicitely told to do so.
+There is support for multiple providers, it is possible to write different
+configurations for each one. The configuration chosen is selected at delivery
+time, so that if for example a delivery of a message failed while connected with
+provider 1, it may be delivered when connected to provider 2. For each provider
+another mail host (or none) can be specified.
+
+Masqmail provides (a yet simple) mechanism to rewrite headers, also depending on
+the current connection. This makes it possible to deliver messages with a return
+address on the local network which will be rewitten at delivery time.
+
+The purpose of this is:
+
+- to allow delivery failure messages that are produced on the local network to
+be delivered immediately, while those that are produced outside can be delivered
+to a mailbox on the internet, to be retrieved later.
+
+- to give mail servers a return address which they can accept if they check for
+spam mail. Many mail servers require a return address which has the same domain
+as the server it is getting the message from. If you normally connect to only
+one provider, this is usually not a problem as you can configure your mailer to
+a fixed address (but then there is still the problem with the failure messages),
+but it is a problem if you use different ones from time to time.
+
+Masqmail shall once be a complete replacement for sendmail (or other MTAs such
+as exim, qmail or smail) on a local network, but it is NOT supposed to be
+installed in a network with a permanent internet connection (at least if it is
+not behind a secure firewall) because it has no ability to check for undesired
+relaying or spam filtering.
+EOF
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
new file mode 100644
index 0000000000..80df95cc02
--- /dev/null
+++ b/mail/masqmail/HISTORY
@@ -0,0 +1,3 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS, CONFIGURE, BUILD, CONFLICTS, PROVIDES, SECURITY,
+ INSTALL, init.d/masqmail{,.conf}, masqmail.gpg: spell created
diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
new file mode 100755
index 0000000000..2fb052be5f
--- /dev/null
+++ b/mail/masqmail/INSTALL
@@ -0,0 +1,24 @@
+default_install &&
+
+install_config_file examples/masqmail.conf "$INSTALL_ROOT/etc/masqmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/lib/sendmail" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/sendmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&
+
+install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+
+if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
+ chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
+fi &&
+if [[ -e $INSTALL_ROOT/var/spool/mail/lock ]]; then
+ chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/lock"
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SPELL_DIRECTORY/init.d/masqmail.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/masqmail"
+fi
diff --git a/mail/masqmail/PROVIDES b/mail/masqmail/PROVIDES
new file mode 100755
index 0000000000..bebbaa4e08
--- /dev/null
+++ b/mail/masqmail/PROVIDES
@@ -0,0 +1,2 @@
+MAIL-TRANSPORT-AGENT
+SENDMAIL
diff --git a/mail/masqmail/SECURITY b/mail/masqmail/SECURITY
new file mode 100755
index 0000000000..e1979f3438
--- /dev/null
+++ b/mail/masqmail/SECURITY
@@ -0,0 +1,3 @@
+The use of MasqMail is *strongly* discouraged if you have a permanent connection
+to the internet without a firewall. Mainly because it does not have the ability
+to block relaying (it relays every mail). --FAQ
diff --git a/mail/masqmail/init.d/masqmail b/mail/masqmail/init.d/masqmail
new file mode 100755
index 0000000000..478438c9bb
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/masqmail
+
+PROGRAM=/usr/sbin/masqmail
+ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/masqmail/masqmail.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/masqmail/init.d/masqmail.conf b/mail/masqmail/init.d/masqmail.conf
new file mode 100644
index 0000000000..0e16086234
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail.conf
@@ -0,0 +1,10 @@
+#
+# Configuration file for masqmail's init.d script
+#
+
+#
+# Accumulated message queue process time
+# e.g. every 10 minutes
+#
+QUEUE_DELAY=10m
+
diff --git a/mail/masqmail/masqmail.gpg b/mail/masqmail/masqmail.gpg
new file mode 100644
index 0000000000..b489034c0a
--- /dev/null
+++ b/mail/masqmail/masqmail.gpg
Binary files differ
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index ef52ac0b50..b94f6db1b3 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts qmail &&
conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 79e1a0254c..a795e426a1 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-06-25 Elisamuel Resto <ryuji@sourcemage.org>
* DEPENDS: updated stable to 2.8.3; experimental to 2.9-20110615
diff --git a/mail/qmail/CONFLICTS b/mail/qmail/CONFLICTS
index 6496d05560..3c0a6f0aef 100755
--- a/mail/qmail/CONFLICTS
+++ b/mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts netqmail &&
conflicts sendmail &&
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index b05ddd1d71..287eff917d 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2010-04-20 Dave Josephsen <dave@sourcemage.org>
* CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch
diff --git a/mail/sendmail/CONFLICTS b/mail/sendmail/CONFLICTS
index ecde46672a..38cde47993 100755
--- a/mail/sendmail/CONFLICTS
+++ b/mail/sendmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
conflicts exim &&
diff --git a/mail/sendmail/HISTORY b/mail/sendmail/HISTORY
index 41219d9b72..98ec9e1949 100644
--- a/mail/sendmail/HISTORY
+++ b/mail/sendmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/mail/ssmtp/CONFLICTS b/mail/ssmtp/CONFLICTS
index de2ee9241b..f55db76758 100755
--- a/mail/ssmtp/CONFLICTS
+++ b/mail/ssmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail
conflicts esmtp
conflicts exim
conflicts qmail
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index e91b691969..1ed69d3a00 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2010-02-05 Bor Kraljič <pyrobor@ver.si>
* DETAILS: changed SOURCE .gz => .bz2
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 4971f4d770..6b878bebae 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,16 +1,10 @@
SPELL=cacti
- VERSION=0.8.7h
- SECURITY_PATCH=2
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:cbd96e8d0fd0fe49249fa4b85174dbdf27d79b42a7934a6466995585f748ddc8b771cd7903199fe4e53d54b1bcfd3c271bbdc93477904cece00520b65c806ebf
-if [[ $CACTI_PA == y ]]; then
- VERSION_PA=3.0
- SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
- SOURCE2_URL[0]=http://www.cacti.net/downloads/pia/$SOURCE2
- SOURCE2_HASH=sha512:2d6d45b2095ec1c09e504516f5c0ebee8734c351a25750565ec09fe5d2a98ccc6e74e0bed12e005d4157f4ec85a3fe3941bf0e538621011c36ba79f0f764c224
-SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=0.8.7i
+ VERSION_PIA=3.1
+ SECURITY_PATCH=3
+ SOURCE=$SPELL-$VERSION-PIA-${VERSION_PIA}.tar.gz
+ SOURCE_HASH=sha512:239e5e4f8697029b6075cd194937aefd95bba961388c98591a867d2ad83d3284d9960bf1ca9241e167f100697fd91b532d311d842a91d63220d6b678eec3699c
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-PIA-${VERSION_PIA}"
SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.cacti.net/
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 92862c42ca..f688dd0435 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i; SECURITY_PATCH++; PA is now bundled
+ * PREPARE: removed
+ * patches: added official patch (http://cacti.net/download_patches.php)
+
2011-10-12 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.8.7h; SECURITY_PATCH++; updated plugin
arch to 3.0; updated PA source url
diff --git a/net/cacti/INSTALL b/net/cacti/INSTALL
index cd7fd5849c..3ab09b7aac 100755
--- a/net/cacti/INSTALL
+++ b/net/cacti/INSTALL
@@ -1,6 +1 @@
-cd ${SOURCE_DIRECTORY} &&
-install_www_files &&
-
-if [[ $CACTI_PA == y ]]; then
- rm_source_dir "$SOURCE_DIRECTORY2"
-fi
+install_www_files
diff --git a/net/cacti/PREPARE b/net/cacti/PREPARE
deleted file mode 100755
index 521ab6dc0d..0000000000
--- a/net/cacti/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-message "Plugin Architecture provides users with the ability to write or use\n" \
- "plugins with Cacti" &&
-
-config_query CACTI_PA "Install Plugin Architecture?" n
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 5d34bebf90..4f1cd3fcdb 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -5,18 +5,4 @@ if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
patch -p1 < $patch
done
-fi &&
-
-if [[ $CACTI_PA == y ]]; then
- mk_source_dir "$SOURCE_DIRECTORY2"
- cd "$SOURCE_DIRECTORY2" &&
- unpack_file 2 &&
-
- cd "$SOURCE_DIRECTORY" &&
-
- cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
- patch -p1 < "$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff" &&
-
- # cleaning up post-patching
- rm -f *.orig
fi
diff --git a/net/cacti/patches/settings_checkbox.patch b/net/cacti/patches/settings_checkbox.patch
new file mode 100644
index 0000000000..2226df2632
--- /dev/null
+++ b/net/cacti/patches/settings_checkbox.patch
@@ -0,0 +1,56 @@
+--- 0.8.7i/graph_settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/graph_settings.php 2011-12-21 11:34:38.000000000 -0500
+@@ -54,7 +54,29 @@
+
+ while (list($tab_short_name, $tab_fields) = each($settings_graphs)) {
+ while (list($field_name, $field_array) = each($tab_fields)) {
+- if ((isset($field_array["items"])) && (is_array($field_array["items"]))) {
++ if ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$sub_field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$sub_field_name', '')");
++ }
++ }
++ }elseif ($field_array["method"] == "textbox_password") {
++ if ($_POST[$field_name] != $_POST[$field_name."_confirm"]) {
++ raise_message(4);
++ break;
++ }elseif (isset($_POST[$field_name])) {
++ $value = $cnn_id->qstr(get_request_var_post($field_name));
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', $value)");
++ }
++ }elseif ((isset($field_array["items"])) && (is_array($field_array["items"]))) {
+ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
+ if (isset($_POST[$sub_field_name])) {
+ $value = $cnn_id->qstr(get_request_var_post($sub_field_name));
+--- 0.8.7i/settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/settings.php 2011-12-21 13:50:23.868244800 -0500
+@@ -32,6 +31,20 @@
+ while (list($field_name, $field_array) = each($settings{$_POST["tab"]})) {
+ if (($field_array["method"] == "header") || ($field_array["method"] == "spacer" )){
+ /* do nothing */
++ }elseif ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("replace into settings (name,value) values ('$field_name', 'on')");
++ }else{
++ db_execute("replace into settings (name,value) values ('$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("replace into settings (name,value) values ('$sub_field_name', 'on')");
++ }else{
++ db_execute("replace into settings (name,value) values ('$sub_field_name', '')");
++ }
++ }
+ }elseif ($field_array["method"] == "textbox_password") {
+ if ($_POST[$field_name] != $_POST[$field_name."_confirm"]) {
+ raise_message(4);
diff --git a/net/cifs-utils/DETAILS b/net/cifs-utils/DETAILS
index 6daffbc626..02767afa37 100755
--- a/net/cifs-utils/DETAILS
+++ b/net/cifs-utils/DETAILS
@@ -1,8 +1,8 @@
SPELL=cifs-utils
- VERSION=5.1
+ VERSION=5.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=ftp://ftp.samba.org/pub/linux-cifs/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:f30640dcfc55cf529b012735b5d5d93db7950a7c5e397ac886a4c83b43d136be13f15eb1ad9ba35d935f0033743c1218cda059b4850e548935235cffb990ae0e
+ SOURCE_HASH=sha512:e5ab1a90911bfd0df6c7ee691f289deda04c38ceaeb5e1e67fda700b687e3cc63874c4261e124467fdf561a7678660ca8f9d17c0e2159242f6e9d7f938fccd7e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
LICENSE[0]=GPL
diff --git a/net/cifs-utils/HISTORY b/net/cifs-utils/HISTORY
index cab9e44ac6..0a80e0c552 100644
--- a/net/cifs-utils/HISTORY
+++ b/net/cifs-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 5.2
+
2011-12-19 Julien "_kaze_" ROZO <julien@rozo.org>
* CONFIGURE, DEPENDS, BUILD: added the possibility to enable/disable
cifsacl, which depends on keyutils to be built
diff --git a/net/ethtool/DETAILS b/net/ethtool/DETAILS
index 7a6d3ff19c..26302737d1 100755
--- a/net/ethtool/DETAILS
+++ b/net/ethtool/DETAILS
@@ -1,9 +1,9 @@
SPELL=ethtool
- VERSION=3.0
+ VERSION=3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/software/network/ethtool/$SOURCE
- SOURCE_HASH=sha512:8a1ae1fa50a28c9fd525f19b695b739bc6f896575315a281cc4b751241385c949d8960e402796b5f36450861063546f037516d41daaea099e7b14ff38f4f1fdb
+ SOURCE_HASH=sha512:ecb23d68c40014bf61cb7e592e593e5cd52bdf4e8073991d33fff1d070e76908275442b2609c093b6a3ccd950352ce152b941d1f25953b1e7758eb74ad1ae3f5
WEB_SITE=http://www.kernel.org/pub/software/network/ethtool/
LICENSE[0]=GPL
ENTERED=20040702
diff --git a/net/ethtool/HISTORY b/net/ethtool/HISTORY
index 26224fcd49..407905fde5 100644
--- a/net/ethtool/HISTORY
+++ b/net/ethtool/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 2b9650d216..31036fdbe0 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,5 +1,7 @@
./configure &&
+echo "CFLAGS += -I$INSTALL_ROOT/usr/include/libnl3" >> ip/Makefile &&
+
if gcc -include netinet/in.h -E - < /dev/null | grep -q IPPROTO_SCTP ; then
echo "" > sctpfix.h
else
diff --git a/net/iproute2/DEPENDS b/net/iproute2/DEPENDS
index 3502de87f4..3866c1e663 100755
--- a/net/iproute2/DEPENDS
+++ b/net/iproute2/DEPENDS
@@ -1,5 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends bison &&
+if is_version_less $(get_kernel_version) 3.2; then
+ depends libnl
+fi &&
+
if [ "$BUILD_DOCS" == "y" ]; then
depends linuxdoc-tools &&
depends psutils &&
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index 34e77d9fcf..e7408ff46a 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,13 +1,14 @@
SPELL=iproute2
- VERSION=2.6.39
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=${SOURCE}.sign
- SOURCE2_IGNORE=signature
+ VERSION=3.2.0
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_HASH=sha512:daa82498a81c0afa322878b4d6d3a448c361a1bb21c1e2f323d8ff4fdf43030106c4e5c9f4c8381f81dd66df2b2d162ac7d62b361b79914e9416d9bfb0c30762
+# SOURCE2=${SOURCE}.sign
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE
- SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
+ SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
+# SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
PATCHLEVEL=0
- SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
+# SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
LICENSE[0]=GPL
WEB_SITE=http://linux-net.osdl.org/index.php/Iproute2
ENTERED=20020528
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 0462b347ba..64c7593b95 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,11 @@
+2012-01-28 Vlad Glagolev <stealth@sourcemage.org>
+ * BUILD: fixed compilation with 2.6.35 and such
+ * DEPENDS: added missing dependency
+
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.0, SOURCE_URL[0] updated
+ * PRE_BUILD, m_xt.patch: patch removed
+
2011-07-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.6.39, bz2 -> gz, sig -> sign
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 0f624edae7..305a26da16 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SPELL_DIRECTORY/m_xt.patch" &&
-
sedit "s/-O2/$CFLAGS/" Makefile &&
sedit "s:DESTDIR=/usr/:DESTDIR=:" Makefile &&
sedit "s:/share/:/usr/share/:" Makefile &&
diff --git a/net/iproute2/m_xt.patch b/net/iproute2/m_xt.patch
deleted file mode 100644
index 43ea142d96..0000000000
--- a/net/iproute2/m_xt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tc/m_xt.c.orig
-+++ tc/m_xt.c
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- return -1;
- }
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- }
-
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
diff --git a/net/ipset/DETAILS b/net/ipset/DETAILS
index 45782f45fc..15fd03b34d 100755
--- a/net/ipset/DETAILS
+++ b/net/ipset/DETAILS
@@ -6,9 +6,9 @@ if is_version_less $(get_kernel_version) 2.6.35; then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_HASH=sha512:ccac555257600b8fd2e229426514582e6f3f04000b4f2bc704d28efdae0869c1c6952ddb9a833a32e49604d16a4a9aa0a5ea847d469a31e567e84f36b76e19f2
else
- VERSION=6.9.1
+ VERSION=6.11
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:024a071613fd56577a2fd37ea6e2a961c113f3ca816077fd24b1698e4bd78a8cb3897291505ea02a9b6565b110170ba93b321b3e1a6476ce93b8d93abe3bd1ed
+ SOURCE_HASH=sha512:ac210f71c2a7a55fc71e36044b8d35174c4a423c74204ac24f056b684af03dde57a617d1f0f4f8e77336db8d716a4d50b58704038fb34073f8fa1bffa9d44210
fi
SOURCE_URL[0]=http://ipset.netfilter.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index 363010289c..f45283ae86 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,2 +1,5 @@
+2012-01-16 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 6.11
+
2011-09-26 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, DEPENDS, {PRE_}BUILD, INSTALL: spell created
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index a11018d04a..b38ceaeea3 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
SPELL=samba
- VERSION=3.6.1
+ VERSION=3.6.2
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:e8afb3d74eef73eaaf016638e141e3b7cd42e907fc63ed3848337bdf3810b9232ac9241c347a4dc9bd76283cf91073aeed9f9b6805b5e569165c702dd2255fd7
+ SOURCE_HASH=sha512:c8b9d82fe664d3630ebc8b2cb5819cf6ecbe73cea6eb10afd6fccad70d622d65b5b866df4ca4dd1550e845b2f86fefadf4c25884017e15fef53422c5080dbbca
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 cee9267733..c86504e26c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.6.2
+
2011-10-21 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.6.1
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 13385aa1a6..e8d4fcca5c 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
SPELL=spine
- VERSION=0.8.7h
+ VERSION=0.8.7i
SOURCE=cacti-$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
- SOURCE_HASH=sha512:681ea0849a477636348fbede7b11d04900cb3a2bbcb747deccaea31c67adfdb07f2692934a44de5975a142632154c7249ca66455c4f1beb1679bcfb56088e396
+ SOURCE_HASH=sha512:3ccca10cdd12672c37591579a9ce9e70a7b4a60c562904ed99c4f26bd73b9227421ea0ba3a87351629847fcf54fdc659404b6e0abaf97d4b63213de82703fabd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
WEB_SITE=http://www.cacti.net/spine_info.php
LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index eac465201e..d8fe182efa 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i
+
2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.8.7h
* DEPENDS: added libcap optional dependency
diff --git a/perl-cpan/io-socket-ssl/DETAILS b/perl-cpan/io-socket-ssl/DETAILS
index 9adb13021b..70b7cb2026 100755
--- a/perl-cpan/io-socket-ssl/DETAILS
+++ b/perl-cpan/io-socket-ssl/DETAILS
@@ -1,5 +1,5 @@
SPELL=io-socket-ssl
- VERSION=1.33
+ VERSION=1.54
SOURCE=IO-Socket-SSL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/IO-Socket-SSL-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/S/SU/SULLR/$SOURCE
diff --git a/perl-cpan/io-socket-ssl/HISTORY b/perl-cpan/io-socket-ssl/HISTORY
index afc730fe46..9345bd36f3 100644
--- a/perl-cpan/io-socket-ssl/HISTORY
+++ b/perl-cpan/io-socket-ssl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.54
+
2010-06-17 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 1.33
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig
deleted file mode 100644
index b981e2cc2e..0000000000
--- a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig
new file mode 100644
index 0000000000..2fdd46efe1
--- /dev/null
+++ b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig
Binary files differ
diff --git a/perl-cpan/net-ssleay/DETAILS b/perl-cpan/net-ssleay/DETAILS
index 48e912074f..38b31a3586 100755
--- a/perl-cpan/net-ssleay/DETAILS
+++ b/perl-cpan/net-ssleay/DETAILS
@@ -1,11 +1,11 @@
SPELL=net-ssleay
- VERSION=1.36
+ VERSION=1.42
SOURCE=Net-SSLeay-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Net-SSLeay-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/F/FL/FLORA/$SOURCE
+ SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/M/MI/MIKEM/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~flora/Net-SSLeay/
+ WEB_SITE=http://search.cpan.org/~mikem/Net-SSLeay/
ENTERED=20011212
KEYWORDS="perl"
SHORT="allows scripts to call the functions in the OpenSSL library"
diff --git a/perl-cpan/net-ssleay/HISTORY b/perl-cpan/net-ssleay/HISTORY
index 9e9b2b3b67..9e8ee592bf 100644
--- a/perl-cpan/net-ssleay/HISTORY
+++ b/perl-cpan/net-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.42; renewed urls
+
2011-08-11 Vlad Glagolev <stealth@sourcemage.org>
* BUILD: made build non-interactive
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig b/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig
deleted file mode 100644
index 8b712a805e..0000000000
--- a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig
new file mode 100644
index 0000000000..d23a97b4bf
--- /dev/null
+++ b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig
Binary files differ
diff --git a/python-pypi/gdata/DETAILS b/python-pypi/gdata/DETAILS
index 0d8762e3a6..f30ad70595 100755
--- a/python-pypi/gdata/DETAILS
+++ b/python-pypi/gdata/DETAILS
@@ -1,7 +1,7 @@
SPELL=gdata
SPELLX=gdata-python-client
- VERSION=2.0.15
- SOURCE_HASH=sha512:c883abe221588bcc38803822f983912f738f77db9619ff1654690ae7ee98cc2cff374bc7541fb87043d3aec1a211c664074c72d7741ed8b741f799fa0df4dec8
+ VERSION=2.0.16
+ SOURCE_HASH=sha512:563480d9c37f6c822764931c1049929dd20a2b548b9fb1276b7e683c13faa1f14a453209fe85d2b3a42dbc7f786684b99527919ff7b4bd4ffff3f38bc9f2e967
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/$SPELLX
diff --git a/python-pypi/gdata/HISTORY b/python-pypi/gdata/HISTORY
index 758025aedd..c55d356d00 100644
--- a/python-pypi/gdata/HISTORY
+++ b/python-pypi/gdata/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0.16
+
2011-12-25 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.15
diff --git a/python-pypi/python-ldap/DEPENDS b/python-pypi/python-ldap/DEPENDS
index 9960b58d0b..aedea46424 100755
--- a/python-pypi/python-ldap/DEPENDS
+++ b/python-pypi/python-ldap/DEPENDS
@@ -1,5 +1,8 @@
depends python &&
depends openldap &&
-optional_depends LIBSASL "" "" "for SASL support" &&
+if is_depends_enabled openldap cyrus-sasl; then
+ optional_depends LIBSASL "" "" "for SASL support"
+fi &&
+
optional_depends openssl "" "" "for encrypted communications"
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index 2652997466..90e30bf47b 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,11 +1,11 @@
SPELL=python-ldap
- VERSION=2.4.3
- SOURCE_HASH=sha512:30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd
+ VERSION=2.4.7
+ SOURCE_HASH=sha512:acb10be5ad1a654096018d488c9c6bf252668daae971881665e6ab15f03ad8d761b2602ebff2eb44e010d1ba028d023556f5dcd1ffcc39dd916b9e9095ed2feb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
LICENSE[0]=PYTHON
- WEB_SITE=http://python-ldap.sourceforge.net/
+ WEB_SITE=http://www.python-ldap.org/
ENTERED=20020416
SHORT="Python interface to LDAP"
cat << EOF
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 0a27af4c28..01404b543d 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.4.7; renewed website
+ * DEPENDS: corrected dependencies
+ * PRE_BUILD: reimplemented defines' selection
+
2011-07-23 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.4.3
diff --git a/python-pypi/python-ldap/PRE_BUILD b/python-pypi/python-ldap/PRE_BUILD
index bea747c09a..9ad426d1fb 100755
--- a/python-pypi/python-ldap/PRE_BUILD
+++ b/python-pypi/python-ldap/PRE_BUILD
@@ -1,11 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if ! is_depends_enabled $SPELL cyrus-sasl; then
- sed -i "s:sasl2 ::" setup.cfg
+if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+ sedit "s: HAVE_SASL::" setup.cfg
fi &&
-sed -i "s|^\(library_dirs[[:space:]]*=\).*$|\1 /usr/lib /usr/lib/sasl2|" \
- setup.cfg &&
-sed -i "s|^\(include_dirs[[:space:]]*=\).*$|\1 /usr/include /usr/include/sasl|" \
- setup.cfg
+if ! is_depends_enabled $SPELL openssl; then
+ sedit "s: HAVE_TLS::" setup.cfg
+fi
diff --git a/python-pypi/twisted/DETAILS b/python-pypi/twisted/DETAILS
index afb59ed8f9..df79b99cc8 100755
--- a/python-pypi/twisted/DETAILS
+++ b/python-pypi/twisted/DETAILS
@@ -1,6 +1,6 @@
SPELL=twisted
- VERSION=10.1.0
- SOURCE_HASH=sha512:25c0e38ae8b206b8397b0d190fc1c5a6afb4f134f4bea2360361a68e2086a1ab0f2038728e69b1caad1475399b9b29d59a4a039fa6bc7ffc897eea587d1f022c
+ VERSION=10.2.0
+ SOURCE_HASH=sha512:ee361df24d789af8ddb6d2f84512431ea73b7f7754d41be4acdae376785a808a74bb341e320f8551c5636d1767b9d5d71a4793accb15ecd7fcc2410820013c45
SOURCE=Twisted-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Twisted-$VERSION
SOURCE_URL[0]=http://tmrc.mit.edu/mirror/twisted/Twisted/${VERSION%.*}/$SOURCE
diff --git a/python-pypi/twisted/HISTORY b/python-pypi/twisted/HISTORY
index 1837b3fcfc..6a052097f8 100644
--- a/python-pypi/twisted/HISTORY
+++ b/python-pypi/twisted/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 10.2.0
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/zopeinterface/DETAILS b/python-pypi/zopeinterface/DETAILS
index cb9e32db06..07912f4abf 100755
--- a/python-pypi/zopeinterface/DETAILS
+++ b/python-pypi/zopeinterface/DETAILS
@@ -1,7 +1,7 @@
SPELL=zopeinterface
SPELLX=zope.interface
- VERSION=3.6.1
- SOURCE_HASH=sha512:db825cf380d0c5e9d99af4dad36d87b765acac9feccbed841a242e65a94c6f8081ec93d1faf3feaf938b1d1ea49eed0b72418d8a285ae78301088407579f7a73
+ VERSION=3.8.0
+ SOURCE_HASH=sha512:7874d46cf23c4525e4bab3c91408966cc2f813ec91ff65c9428ca0e355f5334206e87eee1e7d37705ca3f2294dd162aa4ab239222ab45fee575c2dee6bd0e776
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://pypi.python.org/packages/source/z/$SPELLX/$SOURCE
diff --git a/python-pypi/zopeinterface/HISTORY b/python-pypi/zopeinterface/HISTORY
index 7d2e5da5fb..ef57e8a355 100644
--- a/python-pypi/zopeinterface/HISTORY
+++ b/python-pypi/zopeinterface/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.8.0
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index 0572b1de23..f51744102a 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -3,4 +3,9 @@ if list_find $RDESKTOP_SOUND alsa; then
depends alsa-lib
elif list_find $RDESKTOP_SOUND libao; then
depends libao
-fi
+fi &&
+
+optional_depends libvncserver \
+ "--with-libvncserver" \
+ "--without-libvncserver" \
+ "to build rdp2vnc"
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 117b11292d..e52b4155e9 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,8 @@
+2012-01-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: added libvncserver optional dependency
+ * PRE_BUILD: added, to apply the patch
+ * config.patch: added, to fix configure script for broken flags
+
2012-01-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.7.1
diff --git a/shell-term-fm/rdesktop/PRE_BUILD b/shell-term-fm/rdesktop/PRE_BUILD
new file mode 100755
index 0000000000..5aa3cfd6e2
--- /dev/null
+++ b/shell-term-fm/rdesktop/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/config.patch"
diff --git a/shell-term-fm/rdesktop/config.patch b/shell-term-fm/rdesktop/config.patch
new file mode 100644
index 0000000000..a1c5aa1347
--- /dev/null
+++ b/shell-term-fm/rdesktop/config.patch
@@ -0,0 +1,11 @@
+--- configure.orig 2012-01-09 17:11:57.000000000 +0400
++++ configure 2012-01-23 02:08:14.837525307 +0400
+@@ -5555,7 +5555,7 @@
+
+
+ # Check whether --with-libvncserver was given.
+-if test "${with_libvncserver+set}" = set; then :
++if test "x$with_libvncserver" != "xno"; then :
+ withval=$with_libvncserver;
+ VNCINC=`$vncserverconfig --cflags`
+
diff --git a/shell-term-fm/rxvt-unicode/DETAILS b/shell-term-fm/rxvt-unicode/DETAILS
index 53da1fc50a..357949babf 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
SPELL=rxvt-unicode
- VERSION=9.14
- SOURCE_HASH=sha512:913a1ad8a518da798882caaf6edcd34681a8e36fe8a1b9c768a9ee05cd8ddefaf44b3c58a92f89e812f473458666f5221c7952067a67daaf9cf7812fdf42c74e
+ VERSION=9.15
+ SOURCE_HASH=sha512:1095fb88502377fa669746bbe9a5597f0c748e2c01a468ce382e91236ed0e6f720f3ca7631f7105aa390afac09588b92cebd70589096b6a20f174c4297463b71
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://dist.schmorp.de/$SPELL/$SOURCE
diff --git a/shell-term-fm/rxvt-unicode/HISTORY b/shell-term-fm/rxvt-unicode/HISTORY
index 524979b097..0c0a599c9a 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 9.15
+
2011-12-22 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 9.14
diff --git a/shell-term-fm/shared-mime-info/DETAILS b/shell-term-fm/shared-mime-info/DETAILS
index 6249422cba..1221843d27 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
SPELL=shared-mime-info
- VERSION=0.91
- SOURCE_HASH=sha512:c4cd4934e1ead7f14b839212820baa145b524c234ae197c363a262d843e2efa29603ddb151230702f497e732476e71acddd71ff479c805b7319668e76b44c49c
+ VERSION=1.0
+ SOURCE_HASH=sha512:d4b8ad9a982519681fa0fb5b25d8e6b5c4701bca96785b2729e34330a75668c65b0303ad882c7a1928f48cafc7e5a5803f4bdee4db3cfd76dd58e61435c7e6ca
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY b/shell-term-fm/shared-mime-info/HISTORY
index 9002a0b545..689511fe98 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0
+ * PRE_BUILD: removed
+
2011-11-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.91, bz2 -> xz
* PRE_BUILD: added due to bz2 -> xz
diff --git a/shell-term-fm/shared-mime-info/PRE_BUILD b/shell-term-fm/shared-mime-info/PRE_BUILD
deleted file mode 100755
index 6f545045d8..0000000000
--- a/shell-term-fm/shared-mime-info/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/shell-term-fm/tmux/DETAILS b/shell-term-fm/tmux/DETAILS
index 4a7d740874..89879cd89a 100755
--- a/shell-term-fm/tmux/DETAILS
+++ b/shell-term-fm/tmux/DETAILS
@@ -1,8 +1,8 @@
SPELL=tmux
- VERSION=1.5
+ VERSION=1.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:a2004923d645f32e30d3e6ecee92a5cea71f831718bc09dec14c11a420848d175eff919f00b344ac65be1e2af00362c4b0ffc4e03851d5e3df2fa4c005069bd6
+ SOURCE_HASH=sha512:5c7b311d011f2f2027926a615d4300e97fd22f3ae32b0c364fdf935ff02124c59d1d0c48e7e9d572229c7600b6583fd679f4b960a5af872305f005d27350ad9c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://tmux.sourceforge.net/
LICENSE[0]=BSD
diff --git a/shell-term-fm/tmux/HISTORY b/shell-term-fm/tmux/HISTORY
index eecce7a0a5..4ff0f551ea 100644
--- a/shell-term-fm/tmux/HISTORY
+++ b/shell-term-fm/tmux/HISTORY
@@ -1,3 +1,6 @@
+2012-01-24 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6
+
2011-07-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.5
* PRE_BUILD: removed, not needed
diff --git a/smgl/upstart/DETAILS b/smgl/upstart/DETAILS
index e601825d5c..e4aa4405e7 100755
--- a/smgl/upstart/DETAILS
+++ b/smgl/upstart/DETAILS
@@ -1,15 +1,19 @@
SPELL=upstart
- VERSION=0.6.7
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:789b66eef67d98e320ae859cb1ee157f86d675adb5cebff5db2eb50a172045925d2a39833c5ae3a5885a6a9ad753fe63bc0ff624e0785075cb952d05ef7bbe09
- SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION:0:3}/${SOURCE}
+ SOURCE2=${SOURCE}.asc
+ SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION}/${SOURCE}
+# SOURCE_URL[0]=http://launchpad.net/upstart/1.x/${VERSION}/+download/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=upstart.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://upstart.ubuntu.com
ENTERED=20080113
LICENSE[0]=GPL
SHORT="init system"
cat << EOF
-upstart is a replacement for the /sbin/init daemon which handles starting
-of tasks and services during boot,
-stopping them during shutdown and supervising them while the system is running.
+upstart is a replacement for the /sbin/init daemon which handles starting of
+tasks and services during boot, stopping them during shutdown and supervising
+them while the system is running.
EOF
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 02aa917a39..6badb02ccc 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,5 +1,11 @@
-2011-10-14 Bor Kraljič <pyrobor@ver.si>
- * DETAILS: fixed long description wrap (scripted)
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.4
+ * PRE_BUILD: fixed removal of sysv-compat jobs
+ * upstart.gpg: added another key they use for releases
+
+2011-11-10 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.2, long description <80 col
+ switched to upstream gpg checking
2011-03-30 Arjan Bouter <abouter@sourcemage.org>
* DETAILS: version 0.6.7
diff --git a/smgl/upstart/PRE_BUILD b/smgl/upstart/PRE_BUILD
index bbb1de0c39..dfcbe6d6be 100755
--- a/smgl/upstart/PRE_BUILD
+++ b/smgl/upstart/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit 's/util conf doc/util doc/' Makefile.in
+sedit 's/ conf / /' Makefile.in
diff --git a/smgl/upstart/upstart.gpg b/smgl/upstart/upstart.gpg
new file mode 100644
index 0000000000..765a46dbb9
--- /dev/null
+++ b/smgl/upstart/upstart.gpg
Binary files differ
diff --git a/utils/i7z/BUILD b/utils/i7z/BUILD
new file mode 100755
index 0000000000..4a6b3441f5
--- /dev/null
+++ b/utils/i7z/BUILD
@@ -0,0 +1,10 @@
+make &&
+
+if is_depends_enabled $SPELL qt4; then
+ cd GUI &&
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+ PATH="$QTDIR/bin/qt4:$PATH"
+ qmake PREFIX=$INSTALL_ROOT/usr &&
+ make clean &&
+ make
+fi
diff --git a/utils/i7z/DEPENDS b/utils/i7z/DEPENDS
new file mode 100755
index 0000000000..2ce49c68d2
--- /dev/null
+++ b/utils/i7z/DEPENDS
@@ -0,0 +1,2 @@
+depends ncurses &&
+optional_depends qt4 "" "" "to install iz7 GUI"
diff --git a/utils/i7z/DETAILS b/utils/i7z/DETAILS
new file mode 100755
index 0000000000..895e2410f3
--- /dev/null
+++ b/utils/i7z/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=i7z
+ VERSION=0.27.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://i7z.googlecode.com/files/$SOURCE
+ SOURCE_HASH=sha512:515c239a875ad282563b0b2d735243daaa39c9ef9f2d8c8663a2616ad28c56f0d71a4e1d99bdf88e9250b8090f0f4726ff272b0c6e1265991c86e100d26eb362
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=http://code.google.com/p/i7z/
+ LICENSE[0]=GPL
+ ENTERED=20120122
+ SHORT="i7 (and now i3, i5) reporting tool for Linux"
+cat << EOF
+A better i7 (and now i3, i5) reporting tool for Linux.
+EOF
diff --git a/utils/i7z/HISTORY b/utils/i7z/HISTORY
new file mode 100644
index 0000000000..103c1b8d57
--- /dev/null
+++ b/utils/i7z/HISTORY
@@ -0,0 +1,2 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created, version 0.27.1
diff --git a/utils/i7z/INSTALL b/utils/i7z/INSTALL
new file mode 100755
index 0000000000..8ea4cca668
--- /dev/null
+++ b/utils/i7z/INSTALL
@@ -0,0 +1,6 @@
+cd $SOURCE_DIRECTORY &&
+default_install &&
+
+if is_depends_enabled $SPELL qt4; then
+ install -vm 755 GUI/i7z_GUI $INSTALL_ROOT/usr/bin
+fi
diff --git a/utils/ntp/DEPENDS b/utils/ntp/DEPENDS
index 80847c1ead..cebfbec84c 100755
--- a/utils/ntp/DEPENDS
+++ b/utils/ntp/DEPENDS
@@ -11,4 +11,8 @@ optional_depends mdnsresponder \
optional_depends w3c-libwww \
"" "" \
- "for MD5 functions"
+ "for MD5 functions" &&
+
+optional_depends net-snmp \
+ "--with-ntpsnmpd" "--without-ntpsnmpd" \
+ "for snmp support"
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 2564cdea59..1649c37309 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: added missing optional dep on net-snmp
+
2012-01-05 Julien "_kaze_" ROZO <julien@rozo.org>
* DETAILS: updated version to 4.2.6p5
diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 61b03fab60..985a6525de 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=pciutils
- VERSION=3.1.8
- SOURCE_HASH=sha512:ec81bad10d84fc7a906e78323a896d4014c014e7678b190775f56b4c88768a5423af5825e06c90e544b3f693f4a611310c82e6b9b5a44943f2a7b004f4640142
+ VERSION=3.1.9
+ SOURCE_HASH=sha512:9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index de42e60422..c0f6a19e35 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.1.9
+
2011-10-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.1.8
diff --git a/utils/stow/DETAILS b/utils/stow/DETAILS
index 54c114d0d4..0bdb165557 100755
--- a/utils/stow/DETAILS
+++ b/utils/stow/DETAILS
@@ -1,13 +1,12 @@
SPELL=stow
- VERSION=1.3.3
+ VERSION=2.1.3
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:27b5b4b89f22ba644a6dcece2b36b57feab392eb9702dc0e5659cecfd034f8ece21de1628027d3d717e9f663859e3ce0b174b90e6ac0363218918e330dccda6f
+ SOURCE_HASH=sha512:cbc2abd534484f24d403062b2dac656d9cba2a3b36eea9b7d3715a06cd7a0f468cb0a656322bbc6d36feb2aa8e05f3afe29c571f85900fe39c78f0d8f873aab6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/stow/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
WEB_SITE=http://www.gnu.org/software/stow
ENTERED=20010922
- UPDATED=20020107
KEYWORDS="utils"
SHORT="stow manages the installation of software packages."
cat << EOF
diff --git a/utils/stow/HISTORY b/utils/stow/HISTORY
index e938aef3a4..9115c6aed6 100644
--- a/utils/stow/HISTORY
+++ b/utils/stow/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.1.3
+
2006-06-28 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide
diff --git a/utils/winusb/DEPENDS b/utils/winusb/DEPENDS
new file mode 100755
index 0000000000..b590b3667c
--- /dev/null
+++ b/utils/winusb/DEPENDS
@@ -0,0 +1,9 @@
+depends -sub CXX gcc &&
+depends wxgtk &&
+
+runtime_depends gksu &&
+
+runtime_depends grub2 &&
+runtime_depends parted &&
+runtime_depends ntfs-3g &&
+runtime_depends util-linux
diff --git a/utils/winusb/DETAILS b/utils/winusb/DETAILS
new file mode 100755
index 0000000000..d23a897c92
--- /dev/null
+++ b/utils/winusb/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=winusb
+ VERSION=1.0.3
+ PATCHLEVEL=1
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://fr.congelli.eu/directdl/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:bd9d7f278c4ebf83395686b6a2324408bf72fdb7f12e987378526290b0015147e7e6333010974bf4088d47bf3bbcc62612320742216ec41f2cc69dec9d0ecf8b
+ WEB_SITE=http://en.congelli.eu/prog_info_winusb.html
+ ENTERED=20120120
+ LICENSE[0]=GPL
+ KEYWORDS="windows boot"
+ SHORT="program to create Windows USB stick installer from CD/DVD"
+cat << EOF
+WinUSB is a simple tool that enable you to create your own usb stick windows
+installer from an iso image or a real DVD.
+
+This package contains two programs:
+- WinUSB-gui: a graphical interface which is very easy to use.
+- winusb: the command line tool.
+
+Supported images: Windows Vista, Seven+ installer for any language and any
+version (home, pro...) and Windows PE.
+EOF
diff --git a/utils/winusb/HISTORY b/utils/winusb/HISTORY
new file mode 100644
index 0000000000..7768601f94
--- /dev/null
+++ b/utils/winusb/HISTORY
@@ -0,0 +1,9 @@
+2012-01-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS: gksu is required when running under regular user
+ * PRE_BUILD: apply the patch
+ * parted+ntfs-3g.patch: added to force mount.ntfs-3g instead of kernel's
+ ntfs and fix alignment settings in parted
+
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: spell created
diff --git a/utils/winusb/PRE_BUILD b/utils/winusb/PRE_BUILD
new file mode 100755
index 0000000000..3cc26df8ce
--- /dev/null
+++ b/utils/winusb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/parted+ntfs-3g.patch"
diff --git a/utils/winusb/parted+ntfs-3g.patch b/utils/winusb/parted+ntfs-3g.patch
new file mode 100644
index 0000000000..d7e4e32eec
--- /dev/null
+++ b/utils/winusb/parted+ntfs-3g.patch
@@ -0,0 +1,20 @@
+--- src/winusb.orig 2012-01-19 16:28:30.000000000 +0400
++++ src/winusb 2012-01-21 02:05:58.093387384 +0400
+@@ -330,7 +330,7 @@
+
+ # Create partiton
+ size=$(env LANG='' parted -s "$device" print | grep ^Disk | cut -f2 -d':' | sed 's/\s//g')
+- parted --align cylinder -s "$device" mkpart primary 1MB "$size" # We start at 1MB for grub (it needs a post-mbr gap for its code)
++ parted -s "$device" mkpart primary 1MB "$size" # We start at 1MB for grub (it needs a post-mbr gap for its code)
+ partition="${targetMedia}1" # first partition
+ partprobe "$device" # Reload partition table
+
+@@ -360,7 +360,7 @@
+ fi
+
+ mkdir -p "$partitionMountPath"
+-mount "$partition" "$partitionMountPath"
++mount.ntfs-3g "$partition" "$partitionMountPath"
+
+ freeSpace=$(df --block-size 1 "$partitionMountPath" | grep "$partition" | awk '{print $4}')
+ neededSpace=$(du -s "$isoMountPath" --bytes | awk '{print $1}')
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 994a97305f..7db904c386 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,10 +1,10 @@
SPELL=youtube-dl
- VERSION=2011.08.04
+ VERSION=2012.01.08b
SOURCE=$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/rg3/youtube-dl/raw/$VERSION/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
- SOURCE_HASH=sha512:4a8e0428a9cb6226295fcc111130804136b070f35fdd8f0000284250e8ff1cc43958cd22d8da601102751d934653b2089cffb94795d6a9a484f4391797321056
+ SOURCE_HASH=sha512:c5394f60df62466ab400bf73fdb94f803ab4c83df93d18cde2c3882d5e9027d4832802e21b664f16d283881604e649d76a0a8fe0f12ea672739a67874071d08a
FORCE_DOWNLOAD=on
LICENSE[0]=BSD
KEYWORDS="utils"
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index ed38779219..f821197a0c 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2012.01.08b
+
2011-08-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2011.08.04
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 401394cdf6..04ebccc3a0 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2012.01.07
+ VERSION=2012.01.13
SOURCE=$SPELL.$VERSION.tar.gz
- SOURCE_HASH=sha512:f38e8978a630078b9933d7540fee290d08a53b17137265392be9ce04f4e0e18b52953dc9cee208d8403e484d9e67c43a6e0700495aef708279ed090dcec72744
+ SOURCE_HASH=sha512:b78adafe968ef84d43b1376acb7368283172e8747e880e3dd9daac6a0d529120225bbbf4dad2ea2b0dcd9352bbfe00c5d68616bdac81eba6d1c7537cfe2c3025
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
SOURCE_URL[1]=http://live555sourcecontrol.googlecode.com/files/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 7c5a662a34..021cbb83ab 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2012.01.13
+
2012-01-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2012.01.07
diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index ac855ddb6c..37501a3ba2 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,10 +1,10 @@
SPELL=guvcview
VERSION=1.5.0
SOURCE=${SPELL}-src-${VERSION}.tar.gz
- SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_HASH=sha512:c5d266eb0165eab0973b78ad527bf7806dc1e77d8a4e8d318c613acfaf764677c7a560156b25eb0a6fae5651d1a3e38ed83bb675885be4d1dcc63e57746d886a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
- WEB_SITE=http://guvcview.berlios.de/
+ WEB_SITE=http://guvcview.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20090402
KEYWORDS="video"
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 3239bdafa2..b41680e07a 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: WEB_SITE and SOURCE_URL[0] updated, berlios -> sourceforge
+
2011-08-15 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.5.0
diff --git a/video/lives/DETAILS b/video/lives/DETAILS
index 7f8d30f424..ee2fa57681 100755
--- a/video/lives/DETAILS
+++ b/video/lives/DETAILS
@@ -1,6 +1,6 @@
SPELL=lives
- VERSION=1.0.10
- SOURCE_HASH=sha512:564d3efcce4e7803f0d8cc9828177ef6c1a28976babc5f62767951387bcd28742f91ede959c98a863ee0d1c7ef0feb2406bae07f4e53f7f0ac7704061a05c12a
+ VERSION=1.6.0
+ SOURCE_HASH=sha512:020ec26b58fccd39c0cfd83354aab562343d908891d8f4c97c14d9280b89ec0a95e2bc335381a8d7c62dc5ebd873ef36311fcb4ce19af2cb31a66f5c95aded05
SOURCE=LiVES-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/lives-$VERSION
SOURCE_URL[0]=http://www.xs4all.nl/%7Esalsaman/lives/current/$SOURCE
diff --git a/video/lives/HISTORY b/video/lives/HISTORY
index fc263f1423..072e433f79 100644
--- a/video/lives/HISTORY
+++ b/video/lives/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.0
+
2011-04-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.10
diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index 71849f5e3c..d857f7ea5a 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=4.0.3
+ VERSION=4.0.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
- SOURCE_HASH=sha512:0731ece624444497fb125842e4fc524d8b0782d44d9e84c85a64df73ccb4e7e7bb421a73f137902b4a062c834285e8ce52afda483a38489eff1d87eb47021d52
+ SOURCE_HASH=sha512:770cc2be68808251dbc059b87e670498c4dd7c9d6b761906bd0523212f290f2f72d6dbcd08f810cfc7a61fc4e625e13fe99478db962fc46ca4d32abc73e6d0e7
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index d7438da443..be976f0de2 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,6 @@
+2012-01-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 4.0.5
+
2011-08-15 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.0.3
diff --git a/windowmanagers/aewm/HISTORY b/windowmanagers/aewm/HISTORY
index 3be1f90708..6482d5dcd6 100644
--- a/windowmanagers/aewm/HISTORY
+++ b/windowmanagers/aewm/HISTORY
@@ -1,3 +1,6 @@
+2012-01-23 Arjan Bouter <abouter@sourcemage.org>
+ * PRE_BUILD: fix build error and install paths
+
2011-04-14 Arjan Bouter <abouter@sourcemage.org>
* DETAILS,DEPENDS: switched back to release version
* PREPARE, DOWNLOAD, aewm-build.patch: removed, obsolete
diff --git a/windowmanagers/aewm/PRE_BUILD b/windowmanagers/aewm/PRE_BUILD
index 5cd9f60847..700ca76776 100755
--- a/windowmanagers/aewm/PRE_BUILD
+++ b/windowmanagers/aewm/PRE_BUILD
@@ -1,5 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+sedit 's#^XROOT.*#XROOT = /usr#' Makefile &&
+sedit 's#^BINDIR.*#BINDIR = $(DESTDIR)/usr/bin#' Makefile &&
+sedit 's#^MANDIR.*#MANDIR = $(DESTDIR)/usr/share/man/man1#' Makefile &&
+sedit 's#^GTKLIB =#GTKLIB = -lX11#' Makefile &&
if is_depends_enabled $SPELL libxext ; then
sedit 's/^#OPT_WMFLAGS += -DSHAPE/OPT_WMFLAGS += -DSHAPE/' Makefile &&
sedit 's/^#OPT_WMLIB += -lXext/OPT_WMLIB += -lXext/' Makefile
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 593ba3f0bd..1ec7c95b8d 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter@sourcemage.org>
+ * PRE_BUILD: added to fix glib2 include
+
2011-12-17 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: lua -> lua51
diff --git a/windowmanagers/awesome/PRE_BUILD b/windowmanagers/awesome/PRE_BUILD
new file mode 100755
index 0000000000..0a1261e8af
--- /dev/null
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c
diff --git a/x11-libs/dbusmenu/DEPENDS b/x11-libs/dbusmenu/DEPENDS
new file mode 100755
index 0000000000..fe1dfed8cc
--- /dev/null
+++ b/x11-libs/dbusmenu/DEPENDS
@@ -0,0 +1,17 @@
+depends dbus &&
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '--disable-gtk-doc --disable-gtk-doc-html' \
+ 'for documentation' &&
+optional_depends rarian '--enable-scrollkeeper' \
+ '--disable-scrollkeeper' \
+ 'to register helpfiles with rarian' &&
+optional_depends gtk+3 '--with-gtk=3 --enable-gtk' '' \
+ 'use gtk+3 instead of gtk+2 or no gtk at all' &&
+if ! is_depends_enabled $SPELL gtk+3 ; then
+ optional_depends gtk+2 '--with-gtk=2 --enable-gtk' '--disable-gtk' \
+ 'to build libdbusmenu-gtk'
+fi &&
+optional_depends gobject-introspection '--enable-introspection=yes' \
+ '--enable-introspection=no' \
+ 'for introspection support' &&
+optional_depends vala '--enable-vala' '--disable-vala' 'for vala support'
diff --git a/x11-libs/dbusmenu/DETAILS b/x11-libs/dbusmenu/DETAILS
new file mode 100755
index 0000000000..0f80f2722f
--- /dev/null
+++ b/x11-libs/dbusmenu/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=dbusmenu
+ VERSION=0.5.1
+ SOURCE="lib${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://launchpad.net/${SPELL}/0.5/${VERSION}/+download/${SOURCE}
+ SOURCE_HASH=sha512:c6ddaee7a43c29b3f2fae20012489f12b0fe83defab547df8801ea08ba6cbeea32f2308ee82001a0d5f6ce9cd065e3c68e3369049e1e33ce10fa4811ef932174
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lib${SPELL}-${VERSION}"
+ WEB_SITE="https://launchpad.net/dbusmenu"
+ LICENSE[0]=GPL/LGPL
+ ENTERED=20120123
+ SHORT="dbus menu"
+cat << EOF
+A small little library that was created by pulling out some comon code out of
+indicator-applet. It passes a menu structure across DBus so that a program
+can create a menu simply without worrying about how it is displayed on the
+other side of the bus.
+EOF
diff --git a/x11-libs/dbusmenu/HISTORY b/x11-libs/dbusmenu/HISTORY
new file mode 100644
index 0000000000..1d9f509f8b
--- /dev/null
+++ b/x11-libs/dbusmenu/HISTORY
@@ -0,0 +1,3 @@
+2012-01-23 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 566b5df56b..c42abe789e 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.3.37
+ VERSION=1.4-rc1
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index dd9a10e091..151b51389e 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-27 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated devel to 1.4-rc1
+
2012-01-13 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated devel to 1.3.37
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 53d187ad8f..28d72e9e26 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,6 +1,6 @@
SPELL=gtk+2
- VERSION=2.24.8
- SOURCE=gtk+-$VERSION.tar.bz2
+ VERSION=2.24.9
+ SOURCE=gtk+-$VERSION.tar.xz
SOURCE_GPG=gurus.gpg:$SOURCE.sig
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index c0d72d1f01..bf16c20986 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.24.9
+
2011-11-18 Sukneet Basuta <sukneet@sourcemage.org>
* removed DEVEL since devel happens in gtk+3 now
* DETAILS: removed variables for DEVEL
diff --git a/x11-toolkits/gtk+2/gtk+-2.24.8.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.24.8.tar.bz2.sig
deleted file mode 100644
index 3f22e484ba..0000000000
--- a/x11-toolkits/gtk+2/gtk+-2.24.8.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/x11-toolkits/gtk+2/gtk+-2.24.9.tar.xz.sig b/x11-toolkits/gtk+2/gtk+-2.24.9.tar.xz.sig
new file mode 100644
index 0000000000..3a8cc9afbb
--- /dev/null
+++ b/x11-toolkits/gtk+2/gtk+-2.24.9.tar.xz.sig
Binary files differ
diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index c24cd735c6..c80cc40b15 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,6 +1,6 @@
SPELL=colord
- VERSION=0.1.13
- SOURCE_HASH=sha512:53b2f3d31344b0480e014f4a90ab065e906219ea3d8e996c9e02dda58cfb24c5080712f13fe7dd60bf8b02e5833ec3e8a0e4f7bf2214e90ffa072cebe60cce8b
+ VERSION=0.1.16
+ SOURCE_HASH=sha512:948be787b13f54fb31060fb91b92de03b54f6a00141d42d0312c430cb79cf89864fb62d3ae9da37b05f398938a87f2654e58241cca3889fde9cf86b4953301b8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/colord/releases/$SOURCE
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 06a3bc4a35..11e8ec5d87 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,2 +1,5 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.1.16
+
2011-10-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: spell created, version 0.1.13
diff --git a/x11/colord/PRE_BUILD b/x11/colord/PRE_BUILD
deleted file mode 100755
index 6f545045d8..0000000000
--- a/x11/colord/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 694ea2ef53..0285a90d85 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,5 +1,3 @@
-depends gtk+3 "--with-gtk=3.0" &&
-
depends gnutls &&
depends -sub VAPIGEN vala &&
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 7fcdbcff59..316a5232f3 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,10 +1,15 @@
+2012-01-19 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS, SUB_DEPENDS: Allow choice between gtk+2 (default) and gtk+3
+ Some apps require pythong bindings (e.g. virt-manager) which
+ do not build with gtk+3 selected.
+
2011-11-20 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: bz2 => xz
2011-11-11 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 0.4.4
bz2 => xz
- * DEPENDS: added depends vala with VAPIGEN
+ * DEPENDS: added depends vala with VAPIGEN
2011-07-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.4.3
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 6d312e2eb2..241941fd42 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
- PYTHON) is_depends_enabled $SPELL python && return 0
- ;;
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
esac
return 1
diff --git a/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..241941fd42
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index 474d20839e..e9d41db01e 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -1,6 +1,13 @@
case $THIS_SUB_DEPENDS in
- PYTHON) echo "python bindings requested, forcing them."
- depends python '--with-python'
+ PYTHON) echo "python bindings requested, forcing them." &&
+ depends python '--with-python' &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK2) echo "gtk+2 bindings requested, forcing them." &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ depends gtk+3 '--with-gtk=3.0'
;;
*) echo "unknown sub-depends!"
return 1