Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (2c43c0324357915c7ab39bd5bf2a940f6c173680)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (2c43c0324357915c7ab39bd5bf2a940f6c173680)
  • Date: Sun, 14 Oct 2012 11:12:22 -0500

GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 5
VERSION | 2
http/firefox/DETAILS | 6
http/firefox/HISTORY | 8
http/firefox/PRE_BUILD | 3
http/firefox/install_dir.patch | 56 ++---
http/firefox/installer.patch | 112
----------
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 6
http/tinyproxy/HISTORY | 3
http/tinyproxy/PRE_BUILD | 2
kernels/linux/HISTORY | 21 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2 | 5
kernels/linux/latest.defaults | 2
libs/libyaml/DETAILS | 14 +
libs/libyaml/HISTORY | 3
net/bind-tools/DETAILS | 4
net/bind-tools/HISTORY | 3
net/freeradius/BUILD | 5
net/freeradius/DETAILS | 1
net/freeradius/HISTORY | 4
net/nfs-utils/DETAILS | 2
net/nfs-utils/HISTORY | 5
net/nfs-utils/init.d/nfs | 6
ruby-raa/ruby-1.9/DEPENDS | 1
ruby-raa/ruby-1.9/DETAILS | 6
ruby-raa/ruby-1.9/HISTORY | 6
utils/util-linux/CONFIGURE | 29 --
utils/util-linux/DETAILS | 4
utils/util-linux/HISTORY | 7
utils/util-linux/PREPARE | 33 ++
39 files changed, 219 insertions(+), 191 deletions(-)

New commits:
commit 2c43c0324357915c7ab39bd5bf2a940f6c173680
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

VERSION: 0.61-7

commit 1e9ba5c3fa1237aba19c8c18729037907a4de84c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.13.1 (security)
(cherry picked from commit 8fd3084779c12d7394961ddb4bc1713ee7275dc1)

commit 90f2e2c154c77a09ada71b5c70e4ddf647924377
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.5.7 (lts)
(cherry picked from commit ed5b2f2e6540343478c9c28887fac94a8636d2fc)

commit 17ca5e02c70bba79dbb8ff9cda986dc28482578a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.4.14 (lts)
(cherry picked from commit df3b8099e4896c7282470e2e82509e57334ddf85)

commit ac0b1b19907cc2b98ee863d222bbe7d10500d8a8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.46 (lts)
(cherry picked from commit 4c9b37a610d4af5f6dd8f75d25c8276b84878086)

commit c935bcf55fbb209dc7c22b35595046c12806b6a6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.6.2
(cherry picked from commit 19b3a9d59a288170de7e2495121df2b4912f9df3)

commit 7ef3830c0ebfe398292da478a8c5513f38084477
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libyaml: moved to libs section; new spell, YAML parser and emitter
written in C
(cherry picked from commit 32438ae3cc661be8b175a1f6e70df5da381a83cc)

Conflicts:
ChangeLog

commit af52542e7e1990087b30df4135810654036db5c5
Author: David Kowis <dkowis AT shlrm.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Adding a libyaml spell for ruby
(cherry picked from commit c85537877ae1446fa478ef08cd6c07ec4c078cb6)

commit 16925b8072b98859e8d9dcc62873a291f57592b1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-1.9: => 1.9.3-p286 (security)
(cherry picked from commit 49c9ea516c06190a271e82521cdd9b988c77d938)

commit 28e7bab1c6e020810cab98a009fad415cf6c1807
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-1.9: added optional depends on libyaml
(cherry picked from commit f86eef0f42740e9e4bd3efc67cfc0e9321c9a038)

commit 018bab9b00cb49cc8205bdbf10490d4a63d0021a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox 16.0.1, SECURITY_PATCH=55
(cherry picked from commit fb507e0ecea6923c8aa90fa62089d98dab978e2c)

commit 5ed5ae1a807e903e0b9b69fb19b1b4452c7576ea
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey 2.13, SECURITY_PATCH=47
(cherry picked from commit 384410006d990b99d4291c90b4e8667bac533845)

commit 4701a7f5d887812d22583b93e9161c4f1c385930
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox 16.0, SECURITY_PATCH=54
(cherry picked from commit b4526a31fc6b7c333d88b08d6c54438909945daf)

commit 7a6cd65bd931628748756140bea4981d2a65e161
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.2.31 (eol)
(cherry picked from commit d91f8a39815a3819c4c5a4c6d9f0819a68967d4b)

commit 71e856f7a818868abc2b4fc0cc62c67e39319d8d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bind-tools: => 9.9.1-P4 (security)
(cherry picked from commit be586192310f93a231837ceb28a16fdc1cfb4c7f)

commit 8da3187f709c570719eecc3d53635002a0cf992c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.45 (lts)
(cherry picked from commit 4c224ff65c55d08fe17acf02d76779500dbde918)

commit 60dc6cc790d1d0b8a9fcbf84e6a34b275eab6fd9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.4.13 (lts)
(cherry picked from commit 244c1d08b208dfeffc5a0b6d6e921b32ed29c24f)

commit 92c8e90d28945b0eba6a95215c7461fde00c5e81
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.5.6 (lts)
(cherry picked from commit 0e96553ed02484d0bf41d710d4de8d6fa6070d2c)

commit bde54ee274b8cf0a8d575d33a2f570659b82e52d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tinyproxy: fixed install with automake 1.12
(cherry picked from commit 6fce99a423a41ee45e4d84a1022ac0b2d324a4f8)

commit 03ee05f383ae493ae65a1a68710ce4383fcc423b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.6.1
(cherry picked from commit 85a5e21db6815571a4693273d899d497cde29a35)

commit de29257ed5e323374b70a487ac10d3f8f3c67785
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

util-linux: prevent triggerring from other spells for migrating process
(cherry picked from commit 04c84c0387dca8d7b8ed7fa86c48e03c46e7bd4d)

commit 42bc8a54050f701e95928053688d250049c13d80
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

util-linux 2.21.2
(cherry picked from commit 04c20b6caa8b3ddd2ac65f4feced06727f3fc3c8)

commit 82d99d791eb09496b0e523355b0620fd2d4a035c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nfs-utils: fixed client automounting for NFSv3
(cherry picked from commit 081d4811ac628bc1727a7dcd1460d4ef36d37161)

commit d4bae1ccaa5de03d9ccca3ffb617daeba8b88cf2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

freeradius: don't conflict with system libtool
(cherry picked from commit 17d21a61eb9a70eec24a0a5a856dcd89398c272d)

diff --git a/ChangeLog b/ChangeLog
index 2d47e95..9d72ab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * lib/libyaml: moved to libs section; new spell, YAML parser and
emitter
+ written in C
+ * lib: dropped fake section
+
2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* net/howl: spell deprecated
[Replaced by avahi and no longer compiles for me.]
diff --git a/VERSION b/VERSION
index 37e18a7..0989b7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-6
+0.61-7
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 4670547..19dbddd 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=15.0.1
+ VERSION=16.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=15.0.1
+ VERSION=16.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=53
+ SECURITY_PATCH=55
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 5f3c8be..d609ba7 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2012-10-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 16.0.1, SECURITY_PATCH=55
+
+2012-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 16.0, SECURITY_PATCH=54
+ * install_dir.patch: updated, from Arch
+ * PRE_BUILD, installer.patch: patch removed
+
2012-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 15.0.1, SECURITY_PATCH=53

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index c993d21..1ed86c5 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,9 +11,6 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
-patch -p1 < $SPELL_DIRECTORY/installer.patch &&
-
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index b6f9700..9c115f0 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,28 +1,30 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST = @TOP_DIST@
+diff -Nur mozilla-release.orig/config/baseconfig.mk
mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280
+0000
++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576
+0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk
mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09
07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09
07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
deleted file mode 100644
index d3232b5..0000000
--- a/http/firefox/installer.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# HG changeset patch
-# User Andrew Benton <b3nton AT gmail.com>
-# Date 1339485009 -7200
-# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
-# Parent 253d5996845e9fd994dc9ee542d293fbc412ec56
-Bug 752895 - Don't try to install nspr, nss and sqlite when using system
libraries.
-r=glandium
-
-diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
---- a/browser/installer/Makefile.in
-+++ b/browser/installer/Makefile.in
-@@ -39,16 +39,24 @@ endif
- ifdef MOZ_ENABLE_GNOME_COMPONENT
- DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
- endif
-
- ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
-
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
-
- ifdef _MSC_VER
- DEFINES += -D_MSC_VER=$(_MSC_VER)
- endif
-
-diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -53,19 +53,21 @@
- #endif
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- #ifdef MOZ_SHARED_MOZGLUE
- @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
- #endif
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
- @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
- #endif
- #ifdef XP_MACOSX
- @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@@ -104,17 +106,19 @@
- @BINPATH@/@MOZ_APP_NAME@
- #endif
- @BINPATH@/application.ini
- #ifdef MOZ_UPDATER
- @BINPATH@/update-settings.ini
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
- @BINPATH@/blocklist.xml
- #ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
- #ifndef XP_MACOSX
- @BINPATH@/mozilla-xremote-client
-@@ -578,26 +582,28 @@
- @BINPATH@/components/dom_svg.xpt
- @BINPATH@/components/dom_smil.xpt
-
- ; [Personal Security Manager]
- ;
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
- @BINPATH@/components/pipnss.xpt
- @BINPATH@/components/pippki.xpt
-
- ; for Solaris SPARC
- #ifdef SOLARIS
-
-
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7aaee80..ff45b9d 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.12.1
+ VERSION=2.13.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:f4fa9179d1ef15396dea188279f69342082d99fae5dbfb7c3eb9f5de61638d737342c8d267ed2f51e9f2de7a8629702081385c1930984239d695fc6989c20dbc
+
SOURCE_HASH=sha512:4eb68800337cbf53e9f341ae3b2eed86781a07633f954b5b3657bebdbd629455c66b590a75a1c5917728fa91164336f8077648519b124caceea3e980eebf9f71
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=46
+ SECURITY_PATCH=48
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d5b287f..cef4ddc 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,9 @@
+2012-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.13.1; SECURITY_PATCH++
+
+2012-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.13, SECURITY_PATCH=47
+
2012-09-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.12.1; SECURITY_PATCH++
* DEPENDS: added check for minimum sqlite version
diff --git a/http/tinyproxy/HISTORY b/http/tinyproxy/HISTORY
index 132efc2..d198141 100644
--- a/http/tinyproxy/HISTORY
+++ b/http/tinyproxy/HISTORY
@@ -1,3 +1,6 @@
+2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: fixed install with automake 1.12
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD, INSTALL: don't trash config file on installwatch-based setups

diff --git a/http/tinyproxy/PRE_BUILD b/http/tinyproxy/PRE_BUILD
index 9a7fc9e..e01c65d 100755
--- a/http/tinyproxy/PRE_BUILD
+++ b/http/tinyproxy/PRE_BUILD
@@ -4,6 +4,8 @@ cd "$SOURCE_DIRECTORY" &&
# correct default group name
sed -i "s:Group nobody:Group nogroup:" etc/tinyproxy.conf.in &&

+autoreconf -fi &&
+
if [[ $TINYPROXY_DOCS == n ]]; then
sed -i "s:dummy a2x:dummy true:" configure &&

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index a07ca09..8897e4b 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,24 @@
+2012-10-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.46: added
+ * info/patches/maintenance_patches_3/patch-3.4.14: added
+ * info/patches/maintenance_patches_3/patch-3.5.7: added
+
+2012-10-13 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.2
+ * info/patches/maintenance_patches_3/patch-3.6.2: added
+
+2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.2.31: added
+
+2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.5.6: added
+ * info/patches/maintenance_patches_3/patch-3.4.13: added
+ * info/patches/maintenance_patches_3/patch-3.0.45: added
+
+2012-10-08 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.1
+ * info/patches/maintenance_patches_3/patch-3.6.1: added
+
2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.5.5: added
* info/patches/maintenance_patches_3/patch-3.4.{11,12}: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45
new file mode 100755
index 0000000..bd30561
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.45"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="ea3fb3e5e4c4188f1c04a702400d96060e9c96e7"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46
new file mode 100755
index 0000000..dbf344d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.46"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="004d0d6a8d062c3029e97aa09cef8281dfbc684a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
new file mode 100755
index 0000000..7ce5b22
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.31"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f8a87eaeaf3c3976564e39449bd959023b6ead6f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13
new file mode 100755
index 0000000..63bc88d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.13"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2d804ac4014d0c9be5fa8f184ffeb675280d7882"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14
new file mode 100755
index 0000000..8303548
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.14"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2203a346a1d137f6cdfe3742df748e0f689d0a94"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6
new file mode 100755
index 0000000..e3f2f10
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6
@@ -0,0 +1,5 @@
+appliedkernels="3.5"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="631d7ea41ec8031f6d4e80d21c0d8a5218bdd2bf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7
new file mode 100755
index 0000000..97e986d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7
@@ -0,0 +1,5 @@
+appliedkernels="3.5"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="63fbe3f50d0ccbc5bb8560246c4807bae5337fbf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1
new file mode 100755
index 0000000..e57306d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="43c3179302720e2fa4064556906bf70ccef09f60"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2
new file mode 100755
index 0000000..d93963b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1c21e61be8c786949ac929d77c8d7074119dea58"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 2cdc622..21eb68b 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
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.6
+LATEST_maintenance_patches_3=patch-3.6.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/libyaml/DETAILS b/libs/libyaml/DETAILS
new file mode 100755
index 0000000..b6d40bd
--- /dev/null
+++ b/libs/libyaml/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=libyaml
+ VERSION=0.1.4
+ SOURCE=yaml-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
+
SOURCE_HASH=sha512:808ad695f41d0a0ad04dd0c1419227ac06ef0aa146746e2a71a0a2d80f2a6f1691745f9c43769bea77c11a1428f62b0558281b8f2902edd06979f895fffceda6
+ WEB_SITE=http://pyyaml.org/wiki/LibYAML
+ ENTERED=20120417
+ LICENSE[0]=MIT
+ KEYWORDS="lib"
+ SHORT="YAML parser and emitter written in C"
+cat << EOF
+yaml parser and emitter written in C
+EOF
diff --git a/libs/libyaml/HISTORY b/libs/libyaml/HISTORY
new file mode 100644
index 0000000..fc80446
--- /dev/null
+++ b/libs/libyaml/HISTORY
@@ -0,0 +1,3 @@
+2012-04-17 David Kowis<dkowis AT shlrm.org>
+ * DETAILS,HISTORY: created libyaml spell
+
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 2cc83da..07145c7 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.1-P3
+ VERSION=9.9.1-P4
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 1dc8802..f064c2d 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.9.1-P4; SECURITY_PATCH++
+
2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.9.1-P3; SECURITY_PATCH++

diff --git a/net/freeradius/BUILD b/net/freeradius/BUILD
new file mode 100755
index 0000000..8b4406c
--- /dev/null
+++ b/net/freeradius/BUILD
@@ -0,0 +1,5 @@
+OPTS="--with-system-libltdl \
+ --with-system-libtool \
+ $OPTS" &&
+
+default_build
diff --git a/net/freeradius/DETAILS b/net/freeradius/DETAILS
index 9c34ac4..f03c125 100755
--- a/net/freeradius/DETAILS
+++ b/net/freeradius/DETAILS
@@ -1,6 +1,7 @@
SPELL=freeradius
VERSION=2.2.0
SECURITY_PATCH=2
+ PATCHLEVEL=1
SOURCE=$SPELL-server-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=ftp://ftp.freeradius.org/pub/${SPELL}/${SOURCE}
diff --git a/net/freeradius/HISTORY b/net/freeradius/HISTORY
index 368dc6d..45185ae 100644
--- a/net/freeradius/HISTORY
+++ b/net/freeradius/HISTORY
@@ -1,3 +1,7 @@
+2012-10-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: added, to build with system libtool/libltdl
+
2012-09-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.0; SECURITY_PATCH++
(fixes CVE-2012-3547)
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index a73e24a..fdb0d94 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=1.1.6
- PATCHLEVEL=2
+ PATCHLEVEL=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 8cce150..837bb9e 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,8 @@
+2012-10-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * init.d/nfs: nfsd proc filesystem has nothing to do with NFS4-only;
+ corrected umount for pipefs
+
2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL+=1
* volatiles: moved "/var/lib/nfs/xtab" here from global volatiles
diff --git a/net/nfs-utils/init.d/nfs b/net/nfs-utils/init.d/nfs
index 8dacdd2..8cea6ac 100644
--- a/net/nfs-utils/init.d/nfs
+++ b/net/nfs-utils/init.d/nfs
@@ -88,9 +88,9 @@ start()
echo "Starting NFS services (client & server)"

bins="statd nfsd mountd"
+ mount_nfsd
if [[ ! -z $HASNFS4 ]]; then
mknfsdirs
- mount_nfsd
mount_pipefs
bins="${bins} idmapd"
fi
@@ -137,9 +137,9 @@ stop()
evaluate_retval

bins="statd nfsd mountd"
+ umount_nfsd
if [[ ! -z $HASNFS4 ]]; then
- umount pipefs
- umount_nfsd
+ umount_pipefs
bins="${bins} idmapd"
fi

diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index f42ce5e..8c5f8c3 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -2,4 +2,5 @@ optional_depends doxygen "" "--disable-install-doc" "install
documentation" &&
optional_depends db "" "" "for db support" &&
optional_depends gdbm "" "" "for gdbm support" &&
optional_depends tk "" "" "for tk support" &&
+optional_depends libyaml "" "" "for YAML output (recommended)" &&
optional_depends openssl "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index 26660f7..3d75415 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,9 +1,9 @@
SPELL=ruby-1.9
PACKAGE=ruby
- VERSION=1.9.3-p194
-
SOURCE_HASH=sha512:4b7ec49e21f9d8c51fcc1dec146e7d8c02ff63309484ea02d476820dba7e8fe6b6aed5fb74242614cf21552fbf4ac18f8583ca7138edb169ddbd336056ff4d62
+ VERSION=1.9.3-p286
+
SOURCE_HASH=sha512:513e6b3fbfde129499292104da4ee919f3a5aa5769dfe8070da257c69792454b005e0f7d21ab452cdd5226c9d66990b9a73f343d6ca3f6c19530ea1d1e3cd4ea
SOURCE=$PACKAGE-$VERSION.tar.gz
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKAGE-$VERSION
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 18a9f26..ce333d8 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,9 @@
+2012-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p286; SECURITY_PATCH++
+
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added optional depends on libyaml
+
2012-04-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.3-p194, SECURITY_PATCH=5

diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index df6572b..3b00f63 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,32 +1,3 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-local OLD_SPELL_VERSION="" &&
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-
-# util-linux 2.20 needs ttyX in /etc/inittab without /dev
-# http://www.sourcemage.org/issues/110
-message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
-
-if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
- if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
- message "${DEFAULT_COLOR}" &&
-
- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
- fi
- fi
-fi &&
-
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break
systems like MS Windows)?" y
fi
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 969e6bf..b31d6c8 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -12,9 +12,9 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.21.1
+ VERSION=2.21.2
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:e2eb79ad68225aa27367f516b40a1ea280b6cef4bf49f58507a033ba85f0ff4bafd4bd50a8d5febbb7700c5e41945e797961558b970c54abbe7618b1aa887129
+
SOURCE_HASH=sha512:d6499636b40e22f72b957e0334faefce51656a4d8f8dc038c17d24b03d84e50917112a47a18c6601a048d041263714092ecffbd269d41699a4bdb86a89bc3e30
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 726c081..ee46ca2 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2012-10-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE, PREPARE: prevent triggerring from other spells for
+ migrating process
+
+2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.21.2
+
2012-05-18 Vlad Glagolev <stealth AT sourcemage.org>
* POST_INSTALL: removed, this still must be made in FINAL to not to
be tracked by sorcery
diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index 13921a1..63612c1 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -1,3 +1,34 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
message "aes version is older usually, but needed for loop-AES patch" &&

-config_query_list UL_VERSION "What version do you want to use?" latest aes
+config_query_list UL_VERSION "What version do you want to use?" \
+ latest \
+ aes &&
+
+local OLD_SPELL_VERSION="" &&
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
+
+if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
+ if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
+ fi
+ fi
+fi



  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (2c43c0324357915c7ab39bd5bf2a940f6c173680), Vlad Glagolev, 10/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page