sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (401f526a77ab7d9c9600943fe695acddce311547)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (401f526a77ab7d9c9600943fe695acddce311547)
- Date: Mon, 23 Feb 2015 04:25:29 -0600
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
ChangeLog | 12 -
FUNCTIONS | 20 -
chat-im/pidgin-libnotify/HISTORY | 3
chat-im/pidgin-libnotify/PRE_BUILD | 3
chat-libs/libotr/DETAILS | 6
chat-libs/libotr/HISTORY | 4
crypto/gtk-led-askpass/BUILD | 1
crypto/gtk-led-askpass/DETAILS | 13 -
crypto/gtk-led-askpass/HISTORY | 6
crypto/gtk-led-askpass/PRE_BUILD | 5
dev/null |binary
devel/libtool/DETAILS | 2
devel/libtool/HISTORY | 3
disk/btrfs-progs/BUILD | 6
disk/btrfs-progs/DEPENDS | 19 +
disk/btrfs-progs/DETAILS | 23 +-
disk/btrfs-progs/HISTORY | 10
disk/btrfs-progs/INSTALL | 6
disk/btrfs-progs/PREPARE | 2
disk/btrfs-progs/PRE_BUILD | 6
disk/jfsutils/HISTORY | 4
disk/jfsutils/PRE_BUILD | 4
disk/jfsutils/inttypes.patch | 11 +
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 3
disk/reiser4progs/BUILD | 2
disk/reiser4progs/DEPENDS | 7
disk/reiser4progs/HISTORY | 6
disk/reiser4progs/PRE_BUILD | 4
disk/reiser4progs/readline63.patch | 11 +
editors/vim/DETAILS | 6
editors/vim/HISTORY | 3
graphics/darktable/DETAILS | 6
graphics/darktable/HISTORY | 3
http/firefox/BUILD | 6
http/firefox/HISTORY | 3
libs/libxml2/BUILD | 7
libs/libxml2/HISTORY | 3
php-pear/php/DETAILS | 6
php-pear/php/HISTORY | 4
python-pypi/PY_DEPENDS | 5
science-libs/eigen3/DETAILS | 6
science-libs/eigen3/HISTORY | 3
security/shadow/BUILD | 38 ---
security/shadow/DEPENDS | 12 -
security/shadow/DETAILS | 4
security/shadow/HISTORY | 6
security/shadow/PRE_BUILD | 34 +++
shell-term-fm/rxvt-unicode/DETAILS | 4
shell-term-fm/rxvt-unicode/HISTORY | 3
shell-term-fm/zsh/DETAILS | 9
shell-term-fm/zsh/HISTORY | 3
smgl/epoch/BUILD | 19 +
smgl/epoch/CONFLICTS | 3
smgl/epoch/DEPENDS | 1
smgl/epoch/DETAILS | 32 +++
smgl/epoch/HISTORY | 3
smgl/epoch/INSTALL | 12 +
smgl/epoch/PROVIDES | 1
smgl/epoch/epoch.conf | 332
+++++++++++++++++++++++++++++++++
smgl/epoch/scripts/keymapstart.sh | 44 ++++
smgl/epoch/scripts/keymapstop.sh | 24 ++
smgl/epoch/scripts/mountruntmp.sh | 15 +
smgl/epoch/scripts/udev.sh | 68 ++++++
smgl/initng/CONFLICTS | 3
smgl/initng/HISTORY | 3
smgl/simpleinit-msb/CONFLICTS | 3
smgl/simpleinit-msb/HISTORY | 3
smgl/upstart/CONFLICTS | 3
smgl/upstart/HISTORY | 3
utils/sysstat/HISTORY | 3
utils/sysstat/INSTALL | 17 -
video/mpv/DEPENDS | 5
video/mpv/DETAILS | 8
video/mpv/HISTORY | 4
x11-toolkits/fox/DETAILS | 4
x11-toolkits/fox/HISTORY | 3
x11-toolkits/fox/fox-1.6.50.tar.gz.sig |binary
x11-toolkits/fox/fox-1.7.50.tar.gz.sig |binary
79 files changed, 848 insertions(+), 148 deletions(-)
New commits:
commit 629339bdb357c243182fb580b436c1909b0df063
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
btrfs-progs: => 3.18.2
commit f00578691e3ed3f67c6425ee975da348e6b9a47e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "gtk-led-askpass 0.11"
This reverts commit 60d97df7ad75beb52fd452f262ebd99e46007170.
Usage of devel sorcery is forbidden when working on the grimoire.
Because in comparison with sorcery, grimoire has regular update basis.
Instead this can be done via custom DOWNLOAD file and sorcery version
check if
needed.
commit 77fabf78d0c9c77f9cfb08683e649b3c4082e7af
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
http/firefox: remove -s from LDFLAGS
commit 1c5fab349b302aae4478242e2f66971b08dc0f96
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/darktable: version 1.6.2
commit 9f0ee885ef955b1e2709c09278c1a8aea96b7785
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
shell-term-fm/zsh: version 5.0.7
commit 624c88629295a8b4235580ef73d7f2ae67b1573d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
shell-term-fm/rxvt-unicode: version 9.21
commit 44e3c7c14173ba1e9570dd21dd59b64a303aaf6e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/mpv: version 0.8.0
commit 0654442bfbb120e8f344e48aecd1841200148544
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/vim: version 7.4.640
commit 3f51925fe11d90911d51ae319d092cca9a5a5c5b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
shadow: use sha512-based crypt passwords by default
commit bbe844e826c638ef47e2bb270f722810ef80f32c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sysstat: fixed syntax errors in INSTALL
commit 31f4ce62933ac218b9598b8107eeaab7afe24874
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
jfsutils: fixed build with recent glibc
commit 7b12c2b26642fcaa843ffe0204b415c3a977dab9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
reiser4progs: fixed build with readline 6.3
(cherry picked from commit 6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2)
commit af34d7353faa1ed5653d359735d4beda28da584a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "fix builds involving python3.3"
This reverts commit ee71c06a22645712994fd33e6fc87fdd660f749b.
Conflicts:
ChangeLog
Usage of such stuff is *UNACCEPTABLE*. We get a ton of grep errors and
extra
calls for the spells which DO NOT DEPEND on any version of python!
See your own compile logs and super debug sorcery logs for more info.
commit 7b023bd603824bf5113d9c006ad7bd11b51f425d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "libxml2 - tweak build for python3"
This reverts commit c0ee14fe8afdf9f035aad59547a2384719294a12.
Conflicts:
ChangeLog
commit 5d08c761978d98a56d8ac4f985f26640eb328519
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "FUNCTIONS - fix python2 usage"
This reverts commit 559e955724ce573573b4901423cdaea2c702924a.
Conflicts:
ChangeLog
commit 2a8d29f900217fd36d36ec4b412a0a6542f6040d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "FUNCTIONS - fix typo"
This reverts commit 857999f63a64dc196d33ced7b831740adb520f2f.
Conflicts:
ChangeLog
commit e6fb738df3fd36cdb87caf3d2ac19af5e5d3a63c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: => 5.4.38 [security]
commit 2f5cb889ea91f34756dac77f947c0bb19613d644
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
chat-im/pidgin-libnotify: added fix to build against current libnotify
commit 4c6efdfcb9fdc5d250496c511815df608ec2660d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
removed typos in ChangeLog and epoch's HISTORY
commit 2bc867c8c1c9c62b6450ad58d1627bef5ce2d05d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
fox 1.6.50, 1.7.50
commit cbfcffbd7fd1d016f2467b5c1b0f4cdd6a9e8790
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
eigen3: => 3.2.4
commit ff2331c2b94a68232ed0413ee2a1d50b370d6ce4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/upstart: conflicts with epoch
commit 1a5683264a6f8592fa21edc8b15355f4f80ca5a0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/initng: added CONFLICTS
commit a258661ae46b1fe5986a3c50b43db5d20af56412
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/simpleinit-msb: conflicts with epoch
commit a53a84ef20177cc8a4c39c99f52b73c1b3ff5155
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/epoch: new spell, The Epoch Init System
commit 0271f4f2f18f7e31babf104a6111b5439d573c1b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libtool 2.4.6
commit 4c44d411134ff4f610f34daad27a7e67b038f2a7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
partclone: => 0.2.76
commit b0d8968f68fe2d88a0101f627a3a50ae780f70fa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libotr: => 4.1.0
diff --git a/ChangeLog b/ChangeLog
index 8365cd3..f48cb76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2015-02-20 Treeve Jelbert <treeve AT sourcemage.org>
* devel/kdtree: library for using kd-trees
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * smgl/epoch: new spell, The Epoch Init System
+
2015-02-13 Ismael Luceno <ismael AT sourcemage.org>
* editors/vche: new spell, hex editor
@@ -698,9 +701,6 @@
2013-12-09 Ladislav Hagara <hgr AT vabo.cz>
* python-pypi/python-efl: new spell, python bindings for EFL
-2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS: fix PYTHON2 typo
-
2013-12-03 Ismael Luceno <ismael AT sourcemage.org>
* disk/pspshrink: new spell, ISO Compressor for PSP games
@@ -713,18 +713,12 @@
2013-11-26 Vlad Glagolev <stealth AT sourcemage.org>
* php-pear/php-clamav: new spell, ClamAV Interface for PHP5 scripts
-2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS: fix for python2 usage when it is not primary installation
-
2013-11-24 Jeremy Blosser <jblosser AT sourcemage.org>
* python-pypi/viridian: new spell, ampache client in python
2013-11-24 Ismael Luceno <ismael AT sourcemage.org>
* net/cgminer: new spell, multi-threaded multi-pool FPGA and ASIC
miner for bitcoin
-2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3
-
2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
* loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013)
<jariruusu AT users.sourceforge.net>)
diff --git a/FUNCTIONS b/FUNCTIONS
index 55bef4f..eabb067 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -2,18 +2,6 @@
. $GRIMOIRE/libgcc
. $GRIMOIRE/config_query_multi.function
-if is_depends_enabled $SPELL python;then
- VV=`installed_version python | cut -c-3` &&
- PYTHON2=/usr/bin/python${VV}
- export PYTHON=$PYTHON2
-fi
-
-if is_depends_enabled $SPELL python3;then
- VV=`installed_version python3 | cut -c-3` &&
- PYTHON3=/usr/bin/python${VV}m
- export PYTHON=$PYTHON3
-fi
-
QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
@@ -453,28 +441,28 @@ function unpack_file() {
## Default build for Python2 spell.
#-------------------------------------------------------------------------
function default_build_python() {
- $PYTHON2 setup.py build "$@"
+ python2 setup.py build "$@"
}
#-------------------------------------------------------------------------
## Default build for Python 3 spell.
#-------------------------------------------------------------------------
function default_build_python3() {
- $PYTHON3 setup.py build "$@"
+ python3 setup.py build "$@"
}
#-------------------------------------------------------------------------
## Default install for Python spell.
#-------------------------------------------------------------------------
function default_install_python() {
- $PYTHON2 setup.py install --root "$INSTALL_ROOT/" "$@"
+ python2 setup.py install --root "$INSTALL_ROOT/" "$@"
}
#-------------------------------------------------------------------------
## Default install for Python 3 spell.
#-------------------------------------------------------------------------
function default_install_python3() {
- $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@"
+ python3 setup.py install --root "$INSTALL_ROOT/" "$@"
}
#-------------------------------------------------------------------------
diff --git a/chat-im/pidgin-libnotify/HISTORY
b/chat-im/pidgin-libnotify/HISTORY
index ca9fdd3..ec589f5 100644
--- a/chat-im/pidgin-libnotify/HISTORY
+++ b/chat-im/pidgin-libnotify/HISTORY
@@ -1,3 +1,6 @@
+2015-02-18 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: added to fix building with current libnotify
+
2009-08-15 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS, DETAILS: spell created
diff --git a/chat-im/pidgin-libnotify/PRE_BUILD
b/chat-im/pidgin-libnotify/PRE_BUILD
new file mode 100755
index 0000000..cf2f2b1
--- /dev/null
+++ b/chat-im/pidgin-libnotify/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "289s;NULL, NULL);NULL);" src/pidgin-libnotify.c
diff --git a/chat-libs/libotr/DETAILS b/chat-libs/libotr/DETAILS
index 4b56d57..b726f01 100755
--- a/chat-libs/libotr/DETAILS
+++ b/chat-libs/libotr/DETAILS
@@ -1,13 +1,13 @@
SPELL=libotr
- VERSION=4.0.0
+ VERSION=4.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://www.cypherpunks.ca/otr/${SOURCE}
+ WEB_SITE="https://otr.cypherpunks.ca/";
+ SOURCE_URL[0]=$WEB_SITE/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=2BA87C5C.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://www.cypherpunks.ca/otr/";
LICENSE[0]=GPL
ENTERED=20070609
SHORT="allows you to have private conversations over IM"
diff --git a/chat-libs/libotr/HISTORY b/chat-libs/libotr/HISTORY
index 9f32162..b87d5fc 100644
--- a/chat-libs/libotr/HISTORY
+++ b/chat-libs/libotr/HISTORY
@@ -1,3 +1,7 @@
+2015-02-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1.0
+ new url
+
2013-09-07 Jeremy Blosser <jblosser AT sourcemage.org>
* DETAILS: version 4.0.0
diff --git a/crypto/gtk-led-askpass/BUILD b/crypto/gtk-led-askpass/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/crypto/gtk-led-askpass/BUILD
@@ -0,0 +1 @@
+make
diff --git a/crypto/gtk-led-askpass/DETAILS b/crypto/gtk-led-askpass/DETAILS
index 222cbbb..e170524 100755
--- a/crypto/gtk-led-askpass/DETAILS
+++ b/crypto/gtk-led-askpass/DETAILS
@@ -1,11 +1,10 @@
SPELL=gtk-led-askpass
- VERSION=0.11
- SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git://git.rhydd.org/$SPELL::$SPELL-$VERSION
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
- WEB_SITE="http://git.rhydd.org/?p=$SPELL;a=summary";
+ VERSION=0.10
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://rhydd.org/source/gtk-led-aspass/$SOURCE
+
SOURCE_HASH=sha512:4047f301c05c876473a7f554c5b781dcb2b2fe015e1ba81a9679cdac2f9a86eaf86acb07bb3d3dc445f28750da44760d0716a3df8c6772f7626f469d45935588
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.orig
+ WEB_SITE=http://rhydd.org/wiki/Gtk_LED_Askpass
LICENSE[0]=GPL
ENTERED=20080330
SHORT="GTK+2-based ssh-askpass"
diff --git a/crypto/gtk-led-askpass/HISTORY b/crypto/gtk-led-askpass/HISTORY
index ddb0c5d..99169a5 100644
--- a/crypto/gtk-led-askpass/HISTORY
+++ b/crypto/gtk-led-askpass/HISTORY
@@ -1,9 +1,3 @@
-2014-07-11 Ismael Luceno <ismael AT sourcemage.org>
- * BUILD, DETAILS, INSTALL, PRE_BUILD: updated spell to 0.11
- Source fetched from git repository now.
- Updated website.
- Run autoreconf, since it uses autotools now.
-
2008-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: $INSTALL_ROOT
diff --git a/crypto/gtk-led-askpass/PRE_BUILD
b/crypto/gtk-led-askpass/PRE_BUILD
index cde1ced..3f79ea6 100755
--- a/crypto/gtk-led-askpass/PRE_BUILD
+++ b/crypto/gtk-led-askpass/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-autoreconf -fsi
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:/local::" Makefile
diff --git a/devel/libtool/DETAILS b/devel/libtool/DETAILS
index 17dbdcc..cfb68d1 100755
--- a/devel/libtool/DETAILS
+++ b/devel/libtool/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtool
- VERSION=2.4.4
+ VERSION=2.4.6
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/libtool/HISTORY b/devel/libtool/HISTORY
index b86b8c4..07752d3 100644
--- a/devel/libtool/HISTORY
+++ b/devel/libtool/HISTORY
@@ -1,3 +1,6 @@
+2015-02-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.6
+
2014-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.4
diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
index 8f58e6d..a9b8577 100755
--- a/disk/btrfs-progs/BUILD
+++ b/disk/btrfs-progs/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL xmlto; then
+ make BUILD_VERBOSE=1
+else
+ make BUILD_VERBOSE=1 DISABLE_DOCUMENTATION=1
+fi
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
index 575c5ac..21c38f4 100755
--- a/disk/btrfs-progs/DEPENDS
+++ b/disk/btrfs-progs/DEPENDS
@@ -1,4 +1,15 @@
-depends docbook-xsl &&
-depends xmlto &&
-depends acl &&
-depends e2fsprogs
+depends zlib &&
+depends util-linux &&
+depends lzo &&
+
+optional_depends acl "" "" "for btrfs-convert utility" &&
+
+if is_depends_enabled $SPELL acl; then
+ depends e2fsprogs
+fi &&
+
+optional_depends xmlto "" "" "to build documentation" &&
+
+if is_depends_enabled $SPELL xmlto; then
+ depends asciidoc
+fi
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 4d15fdb..3f20989 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -1,16 +1,23 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=btrfs-progs
-
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/$SPELL.git
-if [ "$BTRFS_PROGS_BRANCH" = scm ]; then
+if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
VERSION=$(get_scm_version)
-else
- VERSION=3.14.2
- SOURCE_URL[0]="$SOURCE_URL[0]::v$VERSION"
-fi
- SOURCE=$SPELL-scm.tar.bz2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=git://git.kernel.org/pub/scm/linux/kernel/git/mason/${SPELL}.git:${SPELL}-${VERSION}
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
+else
+ VERSION=3.18.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE2=${SOURCE}.sig
+ SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
+ SOURCE_URL[1]=http://download.sourcemage.org/distro/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE_GPG=gurus.gpg:$SOURCE2:WORKS_FOR_ME
+ SOURCE2_IGNORE=signature
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://btrfs.wiki.kernel.org/
ENTERED=20090205
LICENSE[0]=GPL
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 26d1bf9..ce57ef8 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,13 @@
+2015-02-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.18.2, use our own tarball checked out
+ from
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+ (tag v3.18.2), signed by me; quoting paths
+ * DEPENDS: rewritten proper dependency tree
+ * PREPARE: use release by default
+ * PRE_BUILD: added, to handle btrfs-convert
+ * BUILD, INSTALL: handle docless installation; /bin -> /sbin;
+ verbosity++
+
2015-01-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Depends on xmlto & docbook-xsl for manpages
diff --git a/disk/btrfs-progs/INSTALL b/disk/btrfs-progs/INSTALL
index baa07f4..3593c7d 100755
--- a/disk/btrfs-progs/INSTALL
+++ b/disk/btrfs-progs/INSTALL
@@ -1 +1,5 @@
-make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/bin install
+if is_depends_enabled $SPELL xmlto; then
+ make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/sbin install
+else
+ make DISABLE_DOCUMENTATION=1 DESTDIR="$INSTALL_ROOT" prefix=/usr
bindir=/sbin install
+fi
diff --git a/disk/btrfs-progs/PREPARE b/disk/btrfs-progs/PREPARE
index 22bb1c5..1abc8d1 100755
--- a/disk/btrfs-progs/PREPARE
+++ b/disk/btrfs-progs/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch scm release
+prepare_select_branch release scm
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
new file mode 100755
index 0000000..df25ba6
--- /dev/null
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if ! is_depends_enabled $SPELL acl; then
+ sedit "s:btrfs-convert::g" Makefile
+fi
diff --git a/disk/jfsutils/HISTORY b/disk/jfsutils/HISTORY
index 1446a9f..6c9bd97 100644
--- a/disk/jfsutils/HISTORY
+++ b/disk/jfsutils/HISTORY
@@ -1,3 +1,7 @@
+2015-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, apply patch
+ * inttypes.patch: added, to fix build with recent glibc
+
2012-02-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1; quoting paths
* BUILD: added, all *fsck* stuff must go into /sbin
diff --git a/disk/jfsutils/PRE_BUILD b/disk/jfsutils/PRE_BUILD
new file mode 100755
index 0000000..2ef6e00
--- /dev/null
+++ b/disk/jfsutils/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/inttypes.patch"
diff --git a/disk/jfsutils/inttypes.patch b/disk/jfsutils/inttypes.patch
new file mode 100644
index 0000000..3904b3c
--- /dev/null
+++ b/disk/jfsutils/inttypes.patch
@@ -0,0 +1,11 @@
+--- libfs/devices.h.orig
++++ libfs/devices.h
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER 87
+ #define ERROR_DISK_FULL 112
+
++#include <inttypes.h>
++
+ struct stat;
+
+ int ujfs_get_dev_size(FILE *, int64_t * size);
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index eaa9483..c1fe749 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.75
-
SOURCE_HASH=sha512:8a76db040b76c08d7c34d75c9853ac64921126bd8cd2533bc0eddac725e6518c9847b203425d002cb444bb39154995cb19861a5764f86fe22fd39f057581c632
+ VERSION=0.2.76
+
SOURCE_HASH=sha512:9e54947b52cb52182b27630855013ce94837faddb9f607e0a99be0d00be2ac5243736403dbc712d3de70464a4a889426f3cd7bef776f219284766b6833549bdc
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 6a17523..a803825 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2015-02-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.76
+
2015-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.75
* DEPENDS: xfsprogs, btrfs-progs, jfsutils
diff --git a/disk/reiser4progs/BUILD b/disk/reiser4progs/BUILD
index 131b8ab..a29ec08 100755
--- a/disk/reiser4progs/BUILD
+++ b/disk/reiser4progs/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} ${LIB_MINIMAL}"
&&
+OPTS="${OPTS} ${LIB_MINIMAL}" &&
default_build
diff --git a/disk/reiser4progs/DEPENDS b/disk/reiser4progs/DEPENDS
index c0bb464..28716f2 100755
--- a/disk/reiser4progs/DEPENDS
+++ b/disk/reiser4progs/DEPENDS
@@ -1 +1,6 @@
-depends libaal
+depends libaal &&
+
+optional_depends readline \
+ "--with-readline" \
+ "--without-readline" \
+ "for fancy command line editing support"
diff --git a/disk/reiser4progs/HISTORY b/disk/reiser4progs/HISTORY
index 7ff8721..3b0d919 100644
--- a/disk/reiser4progs/HISTORY
+++ b/disk/reiser4progs/HISTORY
@@ -1,3 +1,9 @@
+2015-02-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing optional dependency -- readline
+ * BUILD: cleaned up
+ * PRE_BUILD: added, to apply the patch
+ * readline63.patch: added, to fix build with readline 6.3
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/disk/reiser4progs/PRE_BUILD b/disk/reiser4progs/PRE_BUILD
new file mode 100755
index 0000000..f57b714
--- /dev/null
+++ b/disk/reiser4progs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/readline63.patch"
diff --git a/disk/reiser4progs/readline63.patch
b/disk/reiser4progs/readline63.patch
new file mode 100644
index 0000000..15cfd21
--- /dev/null
+++ b/disk/reiser4progs/readline63.patch
@@ -0,0 +1,11 @@
+--- libmisc/ui.c.orig 2015-02-12 13:38:15.110001105 +0000
++++ libmisc/ui.c 2015-02-12 13:41:23.940001104 +0000
+@@ -257,7 +257,7 @@
+ #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H)
+ rl_initialize();
+ rl_attempted_completion_function =
+- (CPPFunction *)misc_complete;
++ (rl_completion_func_t *)misc_complete;
+ #endif
+
+ aal_exception_set_handler(misc_exception_handler);
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 8f73b2a..7430193 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -9,9 +9,9 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_IGNORE=volatile
else
XVERSION=7.4
- PATCH_VERSION=282
+ PATCH_VERSION=640
VERSION=$XVERSION.$PATCH_VERSION
- PATCHLEVEL=2
+ PATCHLEVEL=3
SOURCE=${SPELL}-${XVERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
SOURCE_URL[0]=http://ftp.vim.org/pub/vim/unix/${SOURCE}
@@ -25,7 +25,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
SOURCE2=vim-$XVERSION-patches-001-$PATCH_VERSION.tar.xz
SOURCE2_URL[0]=http://www.hawo.net/~siflfran/smgl/$SOURCE2
SOURCE2_URL[1]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
-
SOURCE2_HASH=sha512:90a68e2a6628f218e8c75762289ec2784f318b4070d40fbc112621e582742398b36d81aab0029542413ee945b6fa951839e3bfc3bc8dcc96a986c9a2d05ef80d
+
SOURCE2_HASH=sha512:ae94f446bddfb6e2678e077b9ca9122e1d2b9e92ad2343c195ce4a62011193e77e70e3d1775f2297a5ec98fd1728338f4a93ce2ad55c6899e9abc85836fa0793
fi
WEB_SITE=http://www.vim.org
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index dfb9dbd..dec3e6e 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.4.640
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 5bf5889..91f5ba2 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=1.4.2
+ VERSION=1.6.2
SOURCE="${SPELL}-${VERSION}.tar.xz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/$(echo
$VERSION|cut -f1 -d.).$(echo $VERSION|cut -f2 -d.)/${SOURCE}
-
SOURCE_HASH=sha512:5a4ba7f5de75bb4db31861fbc095e7854bf701211377b42bbbc3da00a57bcf5aa6e81745b5f34c1c6c7d9a6a3a43678db3d8373d556587e2d3c9210193163f9e
+
SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:bd7cfb8f0ab3cce8e302bd089136d9054aa90f12fc5742606fe1cdfb782d252a59f073f6e3b08d093e7adca2e2ccf1b53c187304beff115f1c947e31d0b56cd7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index f977e60..a4a151f 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.2
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 29088fb..08066e4 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -20,6 +20,12 @@ CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
#
+# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
+# remove it here without changing anything...
+#
+LDFLAGS="${LDFLAGS//-s/}" &&
+
+#
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
#
local gccver=$(gcc -dumpversion) &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index e6f7553..325fe1b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: remove -s from LDFLAGS to prevent build error
+
2015-01-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 35.0.1
diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
new file mode 100755
index 0000000..10eb6b8
--- /dev/null
+++ b/libs/libxml2/BUILD
@@ -0,0 +1,7 @@
+if is_depends_enabled $SPELL python3;then
+ export PYTHON=/usr/bin/python3
+fi &&
+if is_depends_enabled $SPELL python;then
+ export PYTHON=/usr/bin/python2.7
+fi &&
+default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index a271d2f..d0a1e12 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,6 +1,3 @@
-2013-11-21 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD: deleted, python usege is solved in FUNCTIONS
-
2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
* BUILD: added, fix detection of python3
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 0958983..b1faf4d 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,10 +1,10 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.4.37
- SECURITY_PATCH=13
+ VERSION=5.4.38
+ SECURITY_PATCH=14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:56c3fc81857c190c5485a880ddc890b01ae99c409805862b8d951156483a730324b43e5c252b55c59931e451592a8567ac2905d7d2d58d6bf27dc5568d972425
+
SOURCE_HASH=sha512:92b2901117bbaa6c4749027e4a7dbb2f4bb50a3f60b52583051abdfcddafbe4715025a928ea9a6c70b51352e5e43f7ced626d78f5fff97cb1be34a9864f9ed6e
elif [[ $PHP5_BRANCH == previous ]]; then
VERSION=5.3.29
SECURITY_PATCH=23
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 135ccb2..16c2786 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2015-02-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.4.38 (stable); SECURITY_PATCH++
+ (CVE-2015-0235, CVE-2015-0273)
+
2015-01-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.37 (stable); SECURITY_PATCH++
(CVE-2015-0231, CVE-2014-9427, CVE-2015-0232)
diff --git a/python-pypi/PY_DEPENDS b/python-pypi/PY_DEPENDS
index 540295f..f20cfb3 100755
--- a/python-pypi/PY_DEPENDS
+++ b/python-pypi/PY_DEPENDS
@@ -1,2 +1,5 @@
depends PYTHON &&
-depends setuptools
+# distutils is now included with python3
+if is_depends_enabled $SPELL python; then
+ depends setuptools
+fi
diff --git a/science-libs/eigen3/DETAILS b/science-libs/eigen3/DETAILS
index 8d41f00..4b05949 100755
--- a/science-libs/eigen3/DETAILS
+++ b/science-libs/eigen3/DETAILS
@@ -1,9 +1,9 @@
SPELL=eigen3
SPELLX=eigen
- VERSION=3.2.1
-
SOURCE_HASH=sha512:0c60139d23c6e51883d06c92d4c089f1b3eb3b75738d7064cfa3bc79148dd23bb00c98a53636fe396d89a3734d950ef938993c5662181d5327a8ae930afeb4e5
+ VERSION=3.2.4
+
SOURCE_HASH=sha512:decf50a54011a8275d6d00194e98933b1184e665802892fe87515590ab92843d538d5170afc549730193dc93ae350674eb59d7d324e1f7d608867c7208c5509a
# the following sha must be updated every time
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-6b38706d90a9
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-10219c95fe65
SOURCE=$VERSION.tar.bz2
SOURCE_URL[0]=https://bitbucket.org/$SPELLX/$SPELLX/get/$SOURCE
WEB_SITE=http://eigen.tuxfamily.org
diff --git a/science-libs/eigen3/HISTORY b/science-libs/eigen3/HISTORY
index 36bcb96..eda1230 100644
--- a/science-libs/eigen3/HISTORY
+++ b/science-libs/eigen3/HISTORY
@@ -1,3 +1,6 @@
+2015-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.4
+
2014-02-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.1
diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index 5be0025..3c9d599 100755
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -1,8 +1,8 @@
-# Do not install default pam configuration files
-sedit 's|pam.d||' etc/Makefile.in &&
+OPTS="--enable-shadowgrp --build=${BUILD} $OPTS" &&
-OPTS="$OPTS --enable-shadowgrp --build=${BUILD}" &&
-if [[ $CROSS_INSTALL == on ]]; then OPTS="$OPTS --host=${HOST}"; fi &&
+if [[ $CROSS_INSTALL == on ]]; then
+ OPTS="--host=${HOST} $OPTS"
+fi &&
./configure --prefix=${TRACK_ROOT}/usr \
--sysconfdir=${TRACK_ROOT}/etc \
@@ -10,33 +10,5 @@ if [[ $CROSS_INSTALL == on ]]; then OPTS="$OPTS
--host=${HOST}"; fi &&
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT &&
-# patch login.defs.linux so that spurious messages don't show up during login
-if echo $OPTS | grep -q -- '--with-libpam'; then
- sedit '
-s|^CHFN_AUTH|#\0|g
-s|^CRACKLIB_DICTPATH|#\0|g
-s|^ENV_HZ|#\0|g
-s|^ENVIRON_FILE|#\0|g
-s|^ENV_PATH|#\0|g
-s|^ENV_SUPATH|#\0|g
-s|^FAILLOG_ENAB|#\0|g
-s|^FTMP_FILE|#\0|g
-s|^LASTLOG_ENAB|#\0|g
-s|^MAIL_CHECK_ENAB|#\0|g
-s|^MOTD_FILE|#\0|g
-s|^NOLOGINS_FILE|#\0|g
-s|^OBSCURE_CHECKS_ENAB|#\0|g
-s|^PASS_ALWAYS_WARN|#\0|g
-s|^PASS_CHANGE_TRIES|#\0|g
-s|^PASS_MIN_LEN|#\0|g
-s|^PORTTIME_CHECKS_ENAB|#\0|g
-s|^QUOTAS_ENAB|#\0|g
-s|^SU_WHEEL_ONLY|#\0|g
-' etc/login.defs
-else
- sedit '
-s|^#MD5_CRYPT_ENAB.*|MD5_CRYPT_ENAB yes|
-' etc/login.defs
-fi
+make DESTDIR=$INSTALL_ROOT
diff --git a/security/shadow/DEPENDS b/security/shadow/DEPENDS
index 1a31341..cb76c42 100755
--- a/security/shadow/DEPENDS
+++ b/security/shadow/DEPENDS
@@ -24,15 +24,15 @@ optional_depends libselinux \
optional_depends attr \
'--with-attr=yes' \
- '--with-attr=no' \
- 'support extended attributes' &&
+ '--with-attr=no' \
+ 'support extended attributes' &&
optional_depends acl \
'--with-acl' \
- '--without-acl' \
- 'for filesystem access control list support' &&
+ '--without-acl' \
+ 'for filesystem access control list support' &&
optional_depends audit \
'--with-audit' \
- '--without-audit' \
- 'support the audit system'
+ '--without-audit' \
+ 'support the audit system'
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index 6fc6641..941d785 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,12 +1,12 @@
SPELL=shadow
VERSION=4.1.5.1
+ SECURITY_PATCH=7
SOURCE_HASH=sha512:c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://pkg-shadow.alioth.debian.org/releases/$SOURCE
WEB_SITE=http://pkg-shadow.alioth.debian.org/
ENTERED=20050303
- SECURITY_PATCH=6
KEYWORDS="security password"
SHORT="Shadow password file utilities"
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index dcf3afc..af6dab9 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,9 @@
+2015-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++; quoting paths
+ * DEPENDS: dropped tabs
+ * BUILD: moved all pre-configuration actions to PRE_BUILD;
readability++
+ * PRE_BUILD: use secure default values actually
+
2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.1.5.1
* PRE_BUILD, copydir.c.patch: patch removed
diff --git a/security/shadow/PRE_BUILD b/security/shadow/PRE_BUILD
new file mode 100755
index 0000000..a9768a1
--- /dev/null
+++ b/security/shadow/PRE_BUILD
@@ -0,0 +1,34 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Do not install default pam configuration files
+sedit 's|pam.d||' etc/Makefile.in &&
+
+# patch login.defs.linux so that spurious messages don't show up during login
+if is_depends_enabled $SPELL linux-pam; then
+ sedit '
+s|^CHFN_AUTH|#\0|g
+s|^CRACKLIB_DICTPATH|#\0|g
+s|^ENV_HZ|#\0|g
+s|^ENVIRON_FILE|#\0|g
+s|^ENV_PATH|#\0|g
+s|^ENV_SUPATH|#\0|g
+s|^FAILLOG_ENAB|#\0|g
+s|^FTMP_FILE|#\0|g
+s|^LASTLOG_ENAB|#\0|g
+s|^MAIL_CHECK_ENAB|#\0|g
+s|^MOTD_FILE|#\0|g
+s|^NOLOGINS_FILE|#\0|g
+s|^OBSCURE_CHECKS_ENAB|#\0|g
+s|^PASS_ALWAYS_WARN|#\0|g
+s|^PASS_CHANGE_TRIES|#\0|g
+s|^PASS_MIN_LEN|#\0|g
+s|^PORTTIME_CHECKS_ENAB|#\0|g
+s|^QUOTAS_ENAB|#\0|g
+s|^SU_WHEEL_ONLY|#\0|g
+' etc/login.defs
+else
+ sedit '
+s|^#ENCRYPT_METHOD.*|ENCRYPT_METHOD SHA512|
+' etc/login.defs
+fi
diff --git a/shell-term-fm/rxvt-unicode/DETAILS
b/shell-term-fm/rxvt-unicode/DETAILS
index d16ebcd..9acfb73 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
SPELL=rxvt-unicode
- VERSION=9.20
-
SOURCE_HASH=sha512:39e1574f7b7034c07ab2e836bb77e0fb0536830df873cc54e6c7583be5e20d36dea3fe0fc889283f163530c77534a3a55de227ee0a8f03564d0f030e60461ff9
+ VERSION=9.21
+
SOURCE_HASH=sha512:d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776
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 5d88669..b4f6a0f 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.21
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* CONFIGURE: clarify what extended ISO 14755 modes means
diff --git a/shell-term-fm/zsh/DETAILS b/shell-term-fm/zsh/DETAILS
index 83b459e..db6f494 100755
--- a/shell-term-fm/zsh/DETAILS
+++ b/shell-term-fm/zsh/DETAILS
@@ -12,8 +12,8 @@ fi
SOURCE_URL[0]=cvs://:pserver:anonymous AT zsh.cvs.sourceforge.net:/cvsroot/zsh:zsh
elif [[ $ZSH_BUILD == "devel" ]];
then
- VERSION=5.0.5
-
SOURCE_HASH=sha512:34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5
+ VERSION=5.0.7
+
SOURCE_HASH=sha512:e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
SOURCE_URL[1]=ftp://ftp.demon.nl/pub/mirrors/zsh/$SOURCE
@@ -21,8 +21,8 @@ then
SOURCE_URL[3]=ftp://ftp.cs.elte.hu/pub/$SPELL/$SOURCE
elif [[ $ZSH_BUILD == "stable" ]];
then
- VERSION=5.0.5
-
SOURCE_HASH=sha512:34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5
+ VERSION=5.0.7
+
SOURCE_HASH=sha512:e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
SOURCE_URL[1]=ftp://ftp.demon.nl/pub/mirrors/zsh/$SOURCE
@@ -43,4 +43,3 @@ customising its behaviour, filename globbing, features to
make
C-shell (csh) users feel more at home and extra features drawn from
tcsh.
EOF
-34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5
/var/spool/sorcery/zsh-5.0.5.tar.bz2
diff --git a/shell-term-fm/zsh/HISTORY b/shell-term-fm/zsh/HISTORY
index 92f098c..9802468 100644
--- a/shell-term-fm/zsh/HISTORY
+++ b/shell-term-fm/zsh/HISTORY
@@ -1,3 +1,6 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.0.7
+
2014-05-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add optional dependency on gdbm
* BUILD: make_normal after default_build
diff --git a/smgl/epoch/BUILD b/smgl/epoch/BUILD
new file mode 100755
index 0000000..6fe9f3a
--- /dev/null
+++ b/smgl/epoch/BUILD
@@ -0,0 +1,19 @@
+rm -r -f objects sbin &&
+mkdir -p objects sbin &&
+
+cd objects &&
+if [ -z $CC ]; then
+ CC=gcc
+fi &&
+$CC $CFLAGS -c ../src/actions.c &&
+$CC $CFLAGS -c ../src/config.c &&
+$CC $CFLAGS -c ../src/console.c &&
+$CC $CFLAGS -c ../src/main.c &&
+$CC $CFLAGS -c ../src/membus.c &&
+$CC $CFLAGS -c ../src/modes.c &&
+$CC $CFLAGS -c ../src/parse.c &&
+$CC $CFLAGS -c ../src/utilfuncs.c &&
+
+$CC $CFLAGS -o ../sbin/epoch \
+ actions.o config.o console.o main.o membus.o modes.o parse.o utilfuncs.o \
+ $LDFLAGS
diff --git a/smgl/epoch/CONFLICTS b/smgl/epoch/CONFLICTS
new file mode 100755
index 0000000..ac4d439
--- /dev/null
+++ b/smgl/epoch/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts upstart &&
+conflicts initng &&
+conflicts simpleinit-msb
diff --git a/smgl/epoch/DEPENDS b/smgl/epoch/DEPENDS
new file mode 100755
index 0000000..35bb696
--- /dev/null
+++ b/smgl/epoch/DEPENDS
@@ -0,0 +1 @@
+depends smgl-fhs
diff --git a/smgl/epoch/DETAILS b/smgl/epoch/DETAILS
new file mode 100755
index 0000000..c990b71
--- /dev/null
+++ b/smgl/epoch/DETAILS
@@ -0,0 +1,32 @@
+ SPELL=epoch
+ VERSION=1.2.2
+ SOURCE="${SPELL}_${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://universe2.us/${SOURCE}
+
SOURCE_HASH=sha512:9e3e38ef95c20237a3db4f47c9464f27e893a665f0692200d89e96b12f6b2e3af9b84d951356b7b354f19ea4fbe372e2e0ba406fdfeb8819914d46cfed3024a3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}_${VERSION}"
+ WEB_SITE="http://universe2.us/epoch.html";
+ LICENSE[0]="PD"
+ ENTERED=20150217
+ DOCS="CHANGELOG README UNLICENSE.TXT"
+ KEYWORDS=""
+ SHORT="The Epoch Init System"
+cat << EOF
+The Epoch Init System is a small but powerful init system for Linux 2.6+.
+It requires a libc, (not glibc specific), a Linux kernel of 2.6 or greater,
+a shell is recommended, and while it will function somewhat without it,
/proc.
+It has very low memory usage, very small binary size, and is designed to be
+suitable for both full blown desktop and server systems as well as keeping
+minimalist and embedded distros heavily in mind. It is architecture and
+compiler independent, written in mostly ANSI C, and is designed with a
+philosophy in mind:
+
+1. Features that aren't our business aren't our business.
+2. Service tracking and management is the business of the init system
+3. Be unintrusive and easily replaced without a reinstall of the OS.
+4. Don't require any dependency libraries outside of libc.
+5. Be small and efficient, but not so small as to be a poor choice for
desktops
+and servers.
+6. Be easily configured and tidy with our configuration.
+7. If it's easy as well as non-costly to implement, and people wish they
could
+do that, let them do that.
+EOF
diff --git a/smgl/epoch/HISTORY b/smgl/epoch/HISTORY
new file mode 100644
index 0000000..dd4f93f
--- /dev/null
+++ b/smgl/epoch/HISTORY
@@ -0,0 +1,3 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFLICTS, DEPENDS, DETAILS, epoch.conf, INSTALL,
+ PROVIDES, scripts/*: spell created
diff --git a/smgl/epoch/INSTALL b/smgl/epoch/INSTALL
new file mode 100755
index 0000000..9a450bf
--- /dev/null
+++ b/smgl/epoch/INSTALL
@@ -0,0 +1,12 @@
+mkdir -p $INSTALL_ROOT/sbin $INSTALL_ROOT/bin
$INSTALL_ROOT/etc/epoch/scripts &&
+install $SOURCE_DIRECTORY/sbin/epoch $INSTALL_ROOT/sbin &&
+for link in init halt poweroff reboot shutdown killall5; do
+ ln -s -f $INSTALL_ROOT/sbin/epoch $INSTALL_ROOT/sbin/$link
+done &&
+ln -s -f $INSTALL_ROOT/sbin/epoch $INSTALL_ROOT/bin/wall &&
+
+install_config_file $SPELL_DIRECTORY/epoch.conf \
+ $INSTALL_ROOT/etc/epoch/epoch.conf &&
+for script in $SPELL_DIRECTORY/scripts/*.sh; do
+ install -m 0755 $script $INSTALL_ROOT/etc/epoch/scripts
+done
diff --git a/smgl/epoch/PROVIDES b/smgl/epoch/PROVIDES
new file mode 100755
index 0000000..d0e366a
--- /dev/null
+++ b/smgl/epoch/PROVIDES
@@ -0,0 +1 @@
+INIT
diff --git a/smgl/epoch/epoch.conf b/smgl/epoch/epoch.conf
new file mode 100644
index 0000000..28f0119
--- /dev/null
+++ b/smgl/epoch/epoch.conf
@@ -0,0 +1,332 @@
+BootBannerText=Welcome back to Source Mage!
+BootBannerColor=GREEN
+
+Hostname=FILE /etc/hostname
+DefaultRunlevel=boot
+EnableLogging=true
+DisableCAD=true
+BlankLogOnBoot=true
+MountVirtual=procfs sysfs devpts+ devshm+
+
+#Begin object specs
+
+ObjectID=sysclock
+ ObjectDescription=Configuring system clock
+ ObjectStartCommand=hwclock -s
+ ObjectStopCommand=hwclock -w
+ ObjectStartPriority=1
+ ObjectStopPriority=2
+ ObjectEnabled=true
+ ObjectOptions=RAWDESCRIPTION
+ ObjectRunlevels=boot core
+
+ObjectID=mountruntmp
+ ObjectDescription=Mounting /run and /tmp
+ ObjectStartCommand=/etc/epoch/scripts/mountruntmp.sh
+ ObjectStopCommand=NONE
+ ObjectStartPriority=2
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=RAWDESCRIPTION
+ ObjectRunlevels=boot core hurr
+
+ObjectID=rwfs
+ ObjectDescription=root filesystem read-write support
+ ObjectStartCommand=/bin/mount -o remount,rw /
+ ObjectStopCommand=/bin/mount -o remount,ro /
+ ObjectStartPriority=4
+ ObjectStopPriority=6
+ ObjectEnabled=true
+ ObjectRunlevels=boot core
+
+ObjectID=udev
+ ObjectDescription=UDev device manager
+ ObjectStartCommand=/etc/epoch/scripts/udev.sh
+ ObjectStopCommand=NONE
+ ObjectStartPriority=3
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectRunlevels=boot durr
+
+ObjectID=keymap
+ ObjectDescription=Keymap
+ ObjectStartCommand=/etc/epoch/scripts/keymapstart.sh
+ ObjectStopCommand=/etc/epoch/scripts/keymapstop.sh
+ ObjectStartPriority=6
+ ObjectStopPriority=5
+ ObjectEnabled=true
+ ObjectRunlevels=boot core hurr
+
+ObjectID=network
+ ObjectDescription=networking
+ ObjectStartCommand=/sbin/ifup --force -a
+ ObjectStopCommand=/sbin/ifdown -a
+ ObjectStartPriority=5
+ ObjectStopPriority=6
+ ObjectEnabled=true
+ ObjectRunlevels=boot core
+
+ObjectID=extrafs
+ ObjectDescription=extra filesystems and swaps
+ ObjectStartCommand=mount -a && swapon -a
+ ObjectStopCommand=swapoff -a && umount -a -r -t
nodevtmpfs,notmpfs,nosysfs,noproc
+ ObjectStartPriority=5
+ ObjectStopPriority=5
+ ObjectEnabled=true
+ ObjectRunlevels=boot durr
+
+ObjectID=killall5_soft
+ ObjectDescription=Terminating all processes
+ ObjectStopCommand=killall5 -15 && sleep 2
+ ObjectStartPriority=0
+ ObjectStopPriority=3
+ ObjectEnabled=true
+ ObjectOptions=HALTONLY RAWDESCRIPTION
+
+ObjectID=killall5
+ ObjectDescription=Killing all processes
+ ObjectStopCommand=killall5 -9 && sleep 2
+ ObjectStartPriority=0
+ ObjectStopPriority=4
+ ObjectEnabled=true
+ ObjectOptions=HALTONLY RAWDESCRIPTION
+
+ObjectID=getty1
+ ObjectDescription=Getty on /dev/tty1
+ ObjectStartCommand=agetty tty1 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=18
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+ObjectID=getty2
+ ObjectDescription=Getty on /dev/tty2
+ ObjectStartCommand=agetty tty2 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=19
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+ObjectID=getty3
+ ObjectDescription=Getty on /dev/tty3
+ ObjectStartCommand=agetty tty3 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=19
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+ObjectID=getty4
+ ObjectDescription=Getty on /dev/tty4
+ ObjectStartCommand=agetty tty4 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=19
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+ObjectID=getty5
+ ObjectDescription=Getty on /dev/tty5
+ ObjectStartCommand=agetty tty5 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=19
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+ObjectID=getty6
+ ObjectDescription=Getty on /dev/tty6
+ ObjectStartCommand=agetty tty6 --noclear&
+ ObjectStopCommand=NONE
+ ObjectStartPriority=19
+ ObjectStopPriority=0
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr core
+
+>!> Examples.
+ObjectID=syslog
+ ObjectDescription=syslog-ng
+ ObjectStartCommand=syslog-ng
+ #ObjectStopCommand=PIDFILE /run/syslogd.pid
+ ObjectStopCommand=PID
+ ObjectStartPriority=6
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr
+
+ObjectID=chrony
+ ObjectDescription=Chrony NTPD service
+ ObjectEnvVar=CHRONY_ARGS=-s
+ ObjectStartCommand=/usr/sbin/chronyd $CHRONY_ARGS
+ ObjectStopCommand=PIDFILE /run/chronyd.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr
+
+ObjectID=dbus
+ ObjectDescription=DBus
+ ObjectStartCommand=mkdir -p /run/dbus && dbus-uuidgen --ensure &&
dbus-daemon --system
+ ObjectStopCommand=PIDFILE /run/dbus/pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=nscd
+ ObjectDescription=Name Service Cache Daemon
+ ObjectEnvVar=NTHREADS=4
+ ObjectEnvVar=TABLES=passwd group hosts services
+ ObjectPrestartCommand=mkdir -p /var/run/nscd /var/cache/nscd
+ ObjectStartCommand=/usr/sbin/nscd --config-file=/etc/nscd.conf
--nthreads=${NTHREADS:=4}
+ ObjectStopCommand=/usr/sbin/nscd --shutdown
+ ObjectReloadCommand=for table in $TABLES; do /usr/sbin/nscd
--invalidate $table; done
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=alsa-state
+ ObjectDescription=ALSA settings
+ ObjectEnvVar=ASOUNDCFG=/etc/asound.state
+ ObjectStartCommand=/usr/sbin/alsactl -F -f $ASOUNDCFG restore
+ ObjectStopCommand=/usr/sbin/alsactl -f $ASOUNDCFG store &&
/usr/bin/amixer set Master mute >/dev/null 2>&1
+ ObjectStartPriority=6
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectRunlevels=boot durr
+
+ObjectID=mpd
+ ObjectDescription=Music Player Daemon
+ ObjectStartCommand=/usr/bin/mpd /etc/sysconfig/mpd
+ ObjectStopCommand=PIDFILE /run/mpd
+ ObjectUser=musicdaemon
+ ObjectGroup=audio
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=minidlna
+ ObjectDescription=MiniDLNA Server
+ ObjectStartCommand=/usr/sbin/minidlnad -f /etc/minidlna.conf
+ ObjectStopCommand=PIDFILE /run/minidlna/minidlna.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=watchdog
+ ObjectDescription=Watchdog
+ ObjectEnvVar=WD_OPTS=-b -v
+ ObjectStartCommand=/usr/sbin/watchdog $WD_OPTS
+ ObjectStopCommand=PIDFILE /run/watchdog.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=slim
+ ObjectDescription=Simple Login Manager
+ ObjectStartCommand=/usr/bin/slim -d
+ ObjectStopCommand=PID
+ ObjectStartPriority=8
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot gui
+
+ObjectID=klogd
+ ObjectDescription=klogd
+ ObjectStartCommand=klogd
+ ObjectStopCommand=PID
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectEnabled=true
+ ObjectRunlevels=boot
+
+ObjectID=crond
+ ObjectDescription=crond
+ ObjectStartCommand=crond
+ ObjectStopCommand=PIDFILE /run/crond.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectEnabled=true
+ ObjectRunlevels=boot durr
+
+ObjectID=sshd
+ ObjectDescription=SSHD
+ ObjectStartCommand=/usr/sbin/sshd
+ ObjectStopCommand=PIDFILE /run/sshd.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=false
+ ObjectRunlevels=boot
+ ObjectOptions=SERVICE AUTORESTART
+
+ObjectID=ntpd
+ ObjectDescription=NTPD service
+ ObjectStartCommand=/usr/sbin/ntpd
+ ObjectStopCommand=PID
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr
+
+ObjectID=gpm
+ ObjectDescription=GPM Mouse Server
+ ObjectStartCommand=gpm -m /dev/input/mice -t imps2
+ ObjectStopCommand=PIDFILE /run/gpm.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE AUTORESTART
+ ObjectRunlevels=boot durr
+
+ObjectID=dbus
+ ObjectDescription=DBus
+ ObjectStartCommand=mkdir /var/run/dbus && dbus-uuidgen --ensure &&
dbus-daemon --system
+ ObjectStopCommand=PIDFILE /run/messagebus.pid
+ ObjectStartPriority=7
+ ObjectStopPriority=1
+ ObjectEnabled=true
+ ObjectOptions=SERVICE
+ ObjectRunlevels=boot durr
+
+ObjectID=plymouthquit
+ ObjectDescription=Stopping Plymouth boot splash
+ ObjectStartCommand=/usr/bin/plymouth quit
+ ObjectStopCommand=NONE
+ ObjectStartPriority=17
+ ObjectStopPriority=0
+ ObjectEnabled=false
+ ObjectRunlevels=boot core
+ ObjectOptions=RAWDESCRIPTION
+
+ObjectID=networkmanager
+ ObjectDescription=NetworkManager
+ ObjectStartCommand=NetworkManager --log-level=ERR
+ ObjectStopCommand=PIDFILE /run/NetworkManager/NetworkManager.pid
+ ObjectStartPriority=16
+ ObjectEnabled=true
+ ObjectRunlevels=boot core
+ ObjectOptions=SERVICE
+<!<
diff --git a/smgl/epoch/scripts/keymapstart.sh
b/smgl/epoch/scripts/keymapstart.sh
new file mode 100755
index 0000000..397a178
--- /dev/null
+++ b/smgl/epoch/scripts/keymapstart.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /etc/sysconfig/keymap
+. /etc/sysconfig/devices
+
+dropfile=/var/tmp/keymap.drop
+
+ if [[ "$KEYMAP" ]]; then
+ /bin/loadkeys $KEYMAP 2>&1
+ fi
+
+ for a in $INCLUDEMAPS; do
+ [[ $(find /usr/share/kbd/keymaps/ -type f -name "$a.inc*" 2>/dev/null)
]] &&
+ [[ ! $(find /usr/share/kbd/keymaps/ -type f -name "$a.map*" 2>/dev/null)
]] &&
+ a="$a.inc"
+ /bin/loadkeys $a 2>&1
+ done
+
+ [[ "$DEVICES" == "devfs" ]] && DEV_TTY="vc/" || DEV_TTY="tty"
+
+ if [[ "$UNICODE_START" ]]; then
+ /bin/kbd_mode -u
+ /bin/dumpkeys | /bin/loadkeys --unicode
+ fi
+
+ if [[ "$TTY_NUMS" == '*' ]]; then
+ TTY_NUMS=
+ for a in $(grep ^tty.*: /etc/inittab); do
+ TTY_NUMS="$TTY_NUMS $(expr "$a" : 'tty\([0-9]*\):.*')"
+ done
+ fi
+
+ for n in $TTY_NUMS; do
+ [[ "$UNICODE_START" ]] && /bin/echo -ne "\033%G" > /dev/$DEV_TTY$n
+ if [[ "$SETFONT_ARGS" ]]; then
+ /bin/setfont $SETFONT_ARGS -C /dev/$DEV_TTY$n
+ fi
+ done
+
+ [[ -f $dropfile ]] && rm $dropfile
+ STATUS_VARS="KEYMAP INCLUDEMAPS SETFONT_ARGS TTY_NUMS UNICODE_START
DEV_TTY"
+ for a in $STATUS_VARS; do
+ /bin/echo "$a=\"${!a}\"" >> $dropfile
+ done
diff --git a/smgl/epoch/scripts/keymapstop.sh
b/smgl/epoch/scripts/keymapstop.sh
new file mode 100755
index 0000000..e9b0575
--- /dev/null
+++ b/smgl/epoch/scripts/keymapstop.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+. /etc/sysconfig/keymap
+. /etc/sysconfig/devices
+
+dropfile=/var/tmp/keymap.drop
+
+ [[ "$TTY_NUMS" ]] && [[ "$SETFONT_ARGS" ]]
+
+ [[ -f $dropfile ]] && . $dropfile && rm $dropfile
+
+ [[ "$KEYMAP$INCLUDEMAPS" ]] &&
+ /bin/loadkeys defkeymap 2>&1
+
+ [[ "$UNICODE_START" ]] &&
+ /bin/kbd_mode -a
+
+ for n in $TTY_NUMS; do
+ [[ "$UNICODE_START" ]] && /bin/echo -ne '\033%@' > /dev/$DEV_TTY$n
+ if [[ "$SETFONT_ARGS" ]]; then
+ /bin/setfont default8x16 -C /dev/$DEV_TTY$n
+ fi
+ done
+
diff --git a/smgl/epoch/scripts/mountruntmp.sh
b/smgl/epoch/scripts/mountruntmp.sh
new file mode 100755
index 0000000..2c38a49
--- /dev/null
+++ b/smgl/epoch/scripts/mountruntmp.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+mount -n tmpfs /sys/fs/cgroup -t tmpfs -o defaults,size=4k,mode=755
+cd /sys/fs/cgroup
+for cgroup in cpuset cpu,cpuacct memory devices freezer net_cls blkio ; do
+ mkdir -p "${cgroup}"
+ mount -n cgroup "$cgroup" -t cgroup -o
defaults,rw,nosuid,nodev,noexec,relatime,${cgroup}
+done
+cd /
+# mount run
+mount -o defaults,size=512m -n -t tmpfs tmpfs /run
+mkdir -p /run/lock
+mkdir -p /run/shm
+# mount tmp
+mount -o defaults,size=1024m -n -t tmpfs tmpfs /tmp
diff --git a/smgl/epoch/scripts/udev.sh b/smgl/epoch/scripts/udev.sh
new file mode 100755
index 0000000..d289ae1
--- /dev/null
+++ b/smgl/epoch/scripts/udev.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+. /etc/sysconfig/devices
+
+udev_mknodes()
+{
+ if [ ! -d $udev_root/fd ]; then
+ ln -fs /proc/self/fd $udev_root/fd
+ fi
+ ln -s /dev/fd/0 $udev_root/stdin
+ ln -s /dev/fd/1 $udev_root/stdout
+ ln -s /dev/fd/2 $udev_root/stderr
+ mkdir $udev_root/shm
+ mkdir $udev_root/pts
+}
+
+start_udev()
+{ (
+ . /etc/udev/udev.conf
+ if findmnt devtmpfs > /dev/null 2>&1; then
+ true
+ else
+ mount -n -t ramfs none $udev_root
+ fi
+ # create some needed stuff
+ udev_mknodes
+
+# strip out kernel sublevel and patchlevel so we can check against them
+# since we don't support 1.x linux kernels then we don't have to check that
+ PATCHLEVEL=`uname -r | cut -d. -f2`
+ SUBLEVEL=`uname -r | cut -d. -f3`
+ tmp=`uname -r | cut -d. -f3 | sed 's/^[0-9]*//g'`
+ SUBLEVEL=${SUBLEVEL/$tmp/}
+
+ # kernel 2.6.15-rc1 and higher don't use hotplug
+ if [[ $(uname -r) = 3.* ]] || [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6
]; then
+ echo > /proc/sys/kernel/hotplug
+ else
+ # Now uses udevsend as the hotplug multiplexer
+ sysctl -w kernel.hotplug="/sbin/udevsend" > /dev/null 2>&1
+ /sbin/udevstart
+ fi
+
+ if [ -f /etc/udev/udev.missing ]; then
+ cd /dev
+ while read line; do
+ if [ "${line:0:1}" == "#" ]; then continue; fi
+ for ((i=0; i<7; i++)); do
+ val[$i]=${line%%:*}
+ line=${line#*:}
+ done
+ if [ "${val[1]}" == "d" ]; then
+ mkdir ${val[0]}
+ else
+ mknod ${val[0]} ${val[1]} ${val[2]} ${val[3]}
+ fi
+ chmod ${val[4]} ${val[0]}
+ chown ${val[5]}:${val[6]} ${val[0]}
+ done < /etc/udev/udev.missing
+ cd /
+ fi
+ kill -USR1 1
+) }
+
+eval "start_$DEVICES"
+/sbin/udevd --daemon
+/sbin/udevadm trigger
+/sbin/udevadm settle --timeout=60
diff --git a/smgl/initng/CONFLICTS b/smgl/initng/CONFLICTS
new file mode 100755
index 0000000..39a9019
--- /dev/null
+++ b/smgl/initng/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts upstart &&
+conflicts simpleinit-msb &&
+conflicts epoch
diff --git a/smgl/initng/HISTORY b/smgl/initng/HISTORY
index a9db4d6..de0080b 100644
--- a/smgl/initng/HISTORY
+++ b/smgl/initng/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added
+
2007-12-05 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: use cmake_build from FUNCTIONS
diff --git a/smgl/simpleinit-msb/CONFLICTS b/smgl/simpleinit-msb/CONFLICTS
index 082e2e4..e46c150 100755
--- a/smgl/simpleinit-msb/CONFLICTS
+++ b/smgl/simpleinit-msb/CONFLICTS
@@ -1,2 +1,3 @@
conflicts upstart &&
-conflicts initng
+conflicts initng &&
+conflicts epoch
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index c643641..6aecc67 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added epoch
+
2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply patch
diff --git a/smgl/upstart/CONFLICTS b/smgl/upstart/CONFLICTS
index cb7b017..a55c6a1 100755
--- a/smgl/upstart/CONFLICTS
+++ b/smgl/upstart/CONFLICTS
@@ -1,2 +1,3 @@
conflicts simpleinit-msb &&
-conflicts initng
+conflicts initng &&
+conflicts epoch
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index c525689..a0e3461 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added epoch
+
2012-01-17 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.4
* PRE_BUILD: fixed removal of sysv-compat jobs
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index b0002f4..d84cb27 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,6 @@
+2015-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * INSTALL: corrected syntax errors; verbosity++
+
2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* CONFIGURE: Query about installing cron jobs.
diff --git a/utils/sysstat/INSTALL b/utils/sysstat/INSTALL
index 14b2547..ee71de0 100755
--- a/utils/sysstat/INSTALL
+++ b/utils/sysstat/INSTALL
@@ -1,16 +1,17 @@
default_install &&
if [[ "x${SYSSTAT_CRON}" == "xy" ]]; then
- if ! -d "${INSTALL_ROOT}"/etc/cron.hourly; then
- install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.hourly
+ if [[ ! -d "${INSTALL_ROOT}"/etc/cron.hourly ]]; then
+ install -d -vm 0755 "${INSTALL_ROOT}"/etc/cron.hourly
fi &&
- if ! -d "${INSTALL_ROOT}"/etc/cron.daily; then
- install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.daily
+ if [[ ! -d "${INSTALL_ROOT}"/etc/cron.daily ]]; then
+ install -d -vm 0755 "${INSTALL_ROOT}"/etc/cron.daily
fi &&
- install -m 0755 "${SPELL_DIRECTORY}"/cron.hourly/sa1 \
- "${INSTALL_ROOT}"/etc/cron.hourly/sa1 &&
- install -m 0755 "${SPELL_DIRECTORY}"/cron.daily/sa2 \
- "${INSTALL_ROOT}"/etc/cron.daily/sa2
+ install -vm 0755 "${SPELL_DIRECTORY}"/cron.hourly/sa1 \
+ "${INSTALL_ROOT}"/etc/cron.hourly/sa1 &&
+
+ install -vm 0755 "${SPELL_DIRECTORY}"/cron.daily/sa2 \
+ "${INSTALL_ROOT}"/etc/cron.daily/sa2
fi
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index a8ab066..a83ddc3 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -34,11 +34,6 @@ optional_depends pulseaudio \
"--disable-pulse" \
"for Pulseaudio audio output" &&
-optional_depends portaudio19 \
- "--enable-portaudio" \
- "--disable-portaudio" \
- "for PortAudio audio output" &&
-
optional_depends JACK-DRIVER \
"--enable-jack" \
"--disable-jack" \
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 38100e4..76843fd 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,13 +1,13 @@
SPELL=mpv
- VERSION=0.7.2
+ VERSION=0.8.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/v${VERSION}.tar.gz
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:7fbfbe3cc255d4ab7d9a18905d680db3d78d6423d38cc5db67d5fa1031d0afb6556a12f9136de8c85e1564dfcdd77e0a462262cf599781f940586be9b767fe8a
- WAF_VERSION=1.8.5
+
SOURCE_HASH=sha512:b97481e0eaad02bb3402635c4188b53cb10661805a4940ec18d1fe2c3312b7504633324c57d3246ddf90a23ab031f11ae5d5f39dd088f4a40a289a8dc664afe9
+ WAF_VERSION=1.8.6
SOURCE2=waf-$WAF_VERSION
SOURCE2_URL[0]=http://ftp.waf.io/pub/release/$SOURCE2
-
SOURCE2_HASH=sha512:b1f0d0d4b745ef791b46bdd8430634a3621ebb5d8b4a3158fb55493c932eda33743ebd3ffc2023a030a6df5eee6c406f5b8b7e2a562c52e0d6a16b2328418dc0
+
SOURCE2_HASH=sha512:5fe9de188b8e72c63a686c7404c6c75d1bc6ef0731595fc0eabf32c023fcb9cb27058a344dbf10f87c754e508190f84f9b9777feeff07703bc158bc6e352ba60
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/*
$DOCS"
WEB_SITE=http://mpv.io/
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 238b3ef..aefc01b 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,7 @@
+2015-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.8.0, waf version 1.8.6
+ * DEPENDS: remove optional dependency on portaudio19
+
2015-01-20 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: added waf 1.8.5 as SOURCE2
* DOWNLOAD: removed, waf is downloaded by DETAILS
diff --git a/x11-toolkits/fox/DETAILS b/x11-toolkits/fox/DETAILS
index f22fcb5..3cad343 100755
--- a/x11-toolkits/fox/DETAILS
+++ b/x11-toolkits/fox/DETAILS
@@ -1,13 +1,13 @@
SPELL=fox
case "$FOX_REL" in
test-1.7.x)
- VERSION=1.7.32
+ VERSION=1.7.50
;;
prev-1.4.x)
VERSION=1.4.35
;;
*)
- VERSION=1.6.49
+ VERSION=1.6.50
;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/x11-toolkits/fox/HISTORY b/x11-toolkits/fox/HISTORY
index dda345a..01d0b1b 100644
--- a/x11-toolkits/fox/HISTORY
+++ b/x11-toolkits/fox/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.50, 1.7.50
+
2013-05-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.49 (stable)
* PREPARE: readability++
diff --git a/x11-toolkits/fox/fox-1.6.49.tar.gz.sig
b/x11-toolkits/fox/fox-1.6.49.tar.gz.sig
deleted file mode 100644
index 4df3870..0000000
Binary files a/x11-toolkits/fox/fox-1.6.49.tar.gz.sig and /dev/null differ
diff --git a/x11-toolkits/fox/fox-1.6.50.tar.gz.sig
b/x11-toolkits/fox/fox-1.6.50.tar.gz.sig
new file mode 100644
index 0000000..052f83c
Binary files /dev/null and b/x11-toolkits/fox/fox-1.6.50.tar.gz.sig differ
diff --git a/x11-toolkits/fox/fox-1.7.32.tar.gz.sig
b/x11-toolkits/fox/fox-1.7.32.tar.gz.sig
deleted file mode 100644
index d768796..0000000
Binary files a/x11-toolkits/fox/fox-1.7.32.tar.gz.sig and /dev/null differ
diff --git a/x11-toolkits/fox/fox-1.7.50.tar.gz.sig
b/x11-toolkits/fox/fox-1.7.50.tar.gz.sig
new file mode 100644
index 0000000..3e49f69
Binary files /dev/null and b/x11-toolkits/fox/fox-1.7.50.tar.gz.sig differ
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (401f526a77ab7d9c9600943fe695acddce311547), Vlad Glagolev, 02/23/2015
Archive powered by MHonArc 2.6.24.