Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (4ead33c97e490366c847140290422130d98839de)

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.60 grimoire by Vlad Glagolev (4ead33c97e490366c847140290422130d98839de)
  • Date: Wed, 1 Feb 2012 03:52:24 -0600

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

VERSION | 2 +-
chat-irc/irssi/DETAILS | 2 +-
chat-irc/irssi/HISTORY | 4 ++++
chat-irc/znc/DETAILS | 4 ++--
chat-irc/znc/HISTORY | 3 +++
disk/grub2/DEPENDS | 1 -
disk/grub2/DETAILS | 1 +
disk/grub2/HISTORY | 10 ++++++++++
disk/grub2/PRE_BUILD | 3 ++-
disk/grub2/fix-udev.patch | 21 +++++++++++++++++++++
graphics-libs/mesalib/CONFIGURE | 4 ++--
graphics-libs/mesalib/HISTORY | 3 +++
http/apache22/DETAILS | 4 ++--
http/apache22/HISTORY | 5 +++++
net/samba/DETAILS | 6 +++---
net/samba/HISTORY | 9 +++++++++
php-pear/php/DETAILS | 16 ++++++++--------
php-pear/php/HISTORY | 3 +++
utils/sudo/DETAILS | 4 ++--
utils/sudo/HISTORY | 9 +++++++++
utils/sudo/INSTALL | 3 ++-
windowmanagers/aewm/HISTORY | 3 +++
windowmanagers/aewm/PRE_BUILD | 4 ++++
23 files changed, 100 insertions(+), 24 deletions(-)

New commits:
commit 4ead33c97e490366c847140290422130d98839de
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

VERSION: 0.60-5

commit b849bd62d2f5e451dfa73be7dc299239c524cf7c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

irssi: fixed the ordering in DETAILS so SOURCE exists before SOURCE2
uses it
(cherry picked from commit 8de4522da45dc74c7760b2b71061346f12f9e782)

commit 9117eef83573fecf494c6e689aecf793c14abaa0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mesalib: Fix broken case statement
(cherry picked from commit 4584785c85692e3efb138a296e64bbcf00f56447)

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

php 5.3.9, SECURITY_PATCH=15, CVE-2011-4885, CVE-2011-4566
(cherry picked from commit 022d4fb55487e1486baf66fd5563ee7ad19e1598)

commit e44255010625e142948f1f73448a7652a606c2a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

utils/sudo: version 1.8.3p2, fixes CVE 2012-0809
(cherry picked from commit 6e39f48e692a201bfd74521abf4c9f90b233cd76)

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

sudo: => 1.8.3p1
(cherry picked from commit b12ad75b55d0d961c07304f61a24fc34f47f8ca3)

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

sudo: => 1.8.3
(cherry picked from commit b7c74767cf44500ca047d8bd26385b04b2f767d7)

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

apache22: => 2.2.22 (security)
(cherry picked from commit d30162a9a33d6358c47c47043c839b34a3570a1a)

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

samba 3.6.3, SECURITY_PATCH=16, CVE-2012-0817
(cherry picked from commit deb8eb7720eda0489f889334fb4837e8ab6b48e8)

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

samba 3.6.2
(cherry picked from commit 07a636e35b3fc503d4d5dcfd1cbc7fe988bc08c2)

commit b2b1f78f8ad7cc853f43add19b0d282afc01fa31
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

samba: Updated to 3.6.1
(cherry picked from commit 869df0bc48f637b35d43af5b8587925e71ab6d10)

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

znc: => 0.204 (security)
(cherry picked from commit 3f2f3c2f39babd734f7ad9f0e7e5814e70aefb72)

commit 132abd0050c5d732ce32a7ce3a7b67c290e8cd08
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

grub2 - fix bug #341 by applying the suggested patch
works for me with udev-179
(cherry picked from commit 2d608d2d0ecda720d92dc551bef78b6af2bf5d8a)

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

grub2: deprecated lzo dependency
(cherry picked from commit 0a6632da3ec527c275fdc9b9a517b48c7bfc21f9)

commit dd55dd87b13c8c3b875ece5cc4085027cca425f6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

aewm: fixed build error and install paths
(cherry picked from commit 10df5b1508afbbb9a8e944b032ff62667b26f930)

diff --git a/VERSION b/VERSION
index 13f0a0e..0b95601 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-4
+0.60-5
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 8f6e7a0..40db363 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -14,11 +14,11 @@ else
VERSION=0.8.15
SECURITY_PATCH=1
SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
- SOURCE=$SPELL-$VERSION.tar.bz2
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.irssi.org
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 37f0c77..187baca 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2011-09-27 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: fixed the fix ;) SOURCE has to exist before
+ SOURCE2=$SOURCE.sig can be used.
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE for scm branch

diff --git a/chat-irc/znc/DETAILS b/chat-irc/znc/DETAILS
index fa3c659..e66550c 100755
--- a/chat-irc/znc/DETAILS
+++ b/chat-irc/znc/DETAILS
@@ -1,6 +1,6 @@
SPELL=znc
- VERSION=0.202
- SECURITY_PATCH=2
+ VERSION=0.204
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://znc.in/releases/$SOURCE
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 8b3a1b9..ad8f411 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,6 @@
+2012-01-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.204; SECURITY_PATCH++ (CVE-2012-0033)
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* CB8FCB06.gpg: added gpg keyring
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index d21f5d9..2f49052 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -2,7 +2,6 @@ depends automake &&
depends gettext &&
depends gnupg &&
depends smgl-fhs &&
-depends lzo &&

if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends autoconf &&
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 83c13e8..0395168 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -12,6 +12,7 @@
# SOURCE_IGNORE=volatile
#else
VERSION=1.99
+ PATCHLEVEL=1
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 8e6c388..15140c0 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,13 @@
+2012-01-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * fix-udev.patch: added
+ * PRE_BUILD: apply patch
+ fixes bug #341, pathc found by Eric Sandalle
+ /boot/grub/grub.cfg generated correctly with udev-179
+
+2012-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: lzo support was removed in 2009
+
2012-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: explicity disable device mapper/ LVM support
* BUILD: force -Os
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e..3cd048f 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -4,4 +4,5 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
else
rm -rf autom4te.cache
-fi
+fi &&
+patch -p0 <$SPELL_DIRECTORY/fix-udev.patch
diff --git a/disk/grub2/fix-udev.patch b/disk/grub2/fix-udev.patch
new file mode 100644
index 0000000..fcfef34
--- /dev/null
+++ b/disk/grub2/fix-udev.patch
@@ -0,0 +1,21 @@
+=== modified file 'grub-core/kern/emu/getroot.c'
+--- grub-core/kern/emu/getroot.c 2011-05-21 05:03:55 +0000
++++ grub-core/kern/emu/getroot.c 2011-05-30 23:56:40 +0000
+@@ -220,9 +220,17 @@ grub_find_root_device_from_mountinfo (co
+ /* Now scan visible mounts for the ones we're interested in. */
+ for (i = entry_len - 1; i >= 0; i--)
+ {
++ struct stat st;
++
+ if (!*entries[i].device)
+ continue;
+
++ if (stat (entries[i].device, &st) < 0)
++ /* The root filesystem device recorded in mountinfo does not
++ exist, perhaps due to a udev bug. Fall back to more primitive
++ methods. */
++ break;
++
+ ret = strdup (entries[i].device);
+ if (relroot)
+ *relroot = strdup (entries[i].enc_root);
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 3cff28c..8a59422 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -79,5 +79,5 @@ case "$MESALIB_BRANCH" in

config_query_option MESALIB_OPTS "build separate OpenGL ES only
libraries?" n \
"--enable-gles-overlay" "--disable-gles-overlay"
- fi
-fi
+ fi
+esac
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 123b07c..86ab54d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE: Fix broken case statement
+
2011-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: select stable branch by default

diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index d55d3e9..1a8ebdb 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.21
- SECURITY_PATCH=14
+ VERSION=2.2.22
+ SECURITY_PATCH=15
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 98b1151..647088d 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,8 @@
+2012-01-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.22; SECURITY_PATCH++ (CVE-2011-3368,
+ CVE-2011-3607, CVE-2011-4317, CVE-2012-0021, CVE-2012-0031,
+ CVE-2012-0053)
+
2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.21; SECURITY_PATCH++ (CVE-2011-3348,
regression introduced by the CVE-2011-3192)
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 4dbeb7e..8124349 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
SPELL=samba
- VERSION=3.6.0
+ VERSION=3.6.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:43fb9e3fb5be2d1478041cd1d1e3f362462d093ee258ebeef881accc7d48a733a54c0ac588815475a85e8f4cd44561e315f57b51e44f74fe3932b31d861fa7b1
+
SOURCE_HASH=sha512:c06a70197003cb72f471a70fb928e7d86067d3b26aa9c56e862bc3d931d518be4b9dce27481427789065db5b29fec214a00a76ae2d2fc3dbdae5502d3bf20852
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2

SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
fi
- SECURITY_PATCH=15
+ SECURITY_PATCH=16
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 6bb6f0a..739c764 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,12 @@
+2012-01-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.3, SECURITY_PATCH=16, CVE-2012-0817
+
+2012-01-26 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.2
+
+2011-10-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.6.1
+
2011-09-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.0
* CONFIGURE, BUILD: removed cifs option
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index e99b39e..551fddc 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.8
- SECURITY_PATCH=14
-
SOURCE_HASH=sha512:2fcd021c04d9e0442ef1d9ba0f78b48e53b4c8bb6f0a11832cc3b1f4e935f3fc831daa4ab159a906f6e1aaed14127886bc9af4420f2ef2b6faf75717376faaa9
+ VERSION=5.3.9
+ SECURITY_PATCH=15
+
SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
@@ -16,8 +16,8 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.8
-
SOURCE_HASH=sha512:2fcd021c04d9e0442ef1d9ba0f78b48e53b4c8bb6f0a11832cc3b1f4e935f3fc831daa4ab159a906f6e1aaed14127886bc9af4420f2ef2b6faf75717376faaa9
+ VERSION=5.3.9
+
SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
elif [[ $PHP5_BRANCH == legacy ]]; then
@@ -36,9 +36,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
else
- VERSION=5.3.8
- SECURITY_PATCH=14
-
SOURCE_HASH=sha512:2fcd021c04d9e0442ef1d9ba0f78b48e53b4c8bb6f0a11832cc3b1f4e935f3fc831daa4ab159a906f6e1aaed14127886bc9af4420f2ef2b6faf75717376faaa9
+ VERSION=5.3.9
+ SECURITY_PATCH=15
+
SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index edeba68..3b1a0d2 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2012-01-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.3.9, SECURITY_PATCH=15, CVE-2011-4885, CVE-2011-4566
+
2011-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: suhosin patch 5.3.7 applies fine for PHP 5.3.8
(semi-security update)
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 9dda1dc..17f43ba 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.8.2
+ VERSION=1.8.3p2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE2_IGNORE=signature
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE_GPG=sudo.gpg:$SOURCE.sig:UPSTREAM_KEY
WEB_SITE=http://www.courtesan.com/sudo
KEYWORDS="utils"
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 2ed049a..5b228bf 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,12 @@
+2012-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.3p2, SECURITY_PATCH++, fixes CVE 2012-0809
+
+2011-10-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.3p1
+
+2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.3
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.8.2

diff --git a/utils/sudo/INSTALL b/utils/sudo/INSTALL
index 03b8bb9..9d9a4c0 100755
--- a/utils/sudo/INSTALL
+++ b/utils/sudo/INSTALL
@@ -1,2 +1,3 @@
make_single &&
-default_install
+default_install &&
+make_normal
diff --git a/windowmanagers/aewm/HISTORY b/windowmanagers/aewm/HISTORY
index 3be1f90..6482d5d 100644
--- a/windowmanagers/aewm/HISTORY
+++ b/windowmanagers/aewm/HISTORY
@@ -1,3 +1,6 @@
+2012-01-23 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fix build error and install paths
+
2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,DEPENDS: switched back to release version
* PREPARE, DOWNLOAD, aewm-build.patch: removed, obsolete
diff --git a/windowmanagers/aewm/PRE_BUILD b/windowmanagers/aewm/PRE_BUILD
index 5cd9f60..700ca76 100755
--- a/windowmanagers/aewm/PRE_BUILD
+++ b/windowmanagers/aewm/PRE_BUILD
@@ -1,5 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+sedit 's#^XROOT.*#XROOT = /usr#' Makefile &&
+sedit 's#^BINDIR.*#BINDIR = $(DESTDIR)/usr/bin#' Makefile &&
+sedit 's#^MANDIR.*#MANDIR = $(DESTDIR)/usr/share/man/man1#' Makefile &&
+sedit 's#^GTKLIB =#GTKLIB = -lX11#' Makefile &&
if is_depends_enabled $SPELL libxext ; then
sedit 's/^#OPT_WMFLAGS += -DSHAPE/OPT_WMFLAGS += -DSHAPE/' Makefile &&
sedit 's/^#OPT_WMLIB += -lXext/OPT_WMLIB += -lXext/' Makefile



  • [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (4ead33c97e490366c847140290422130d98839de), Vlad Glagolev, 02/01/2012

Archive powered by MHonArc 2.6.24.

Top of Page