commit cd5371cc5e80994f555ef709eac123795ac42ec4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.38 (lts)
(cherry picked from commit f4a672e33ce43f200d647c7ec5e2ea9f53ba1bbe)
commit 07535f9910a61306a34c2286086eef339ebb9f32
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
x11vnc: added required libxtst dependency
log from configure:
==========================================================================
*** A working build environment for the XTEST extension was not found ***
(libXtst). An x11vnc built this way will be *ONLY BARELY USABLE*.
You will be able to move the mouse but not click or type. There can
also be deadlocks if an application grabs the X server.
It is recommended that you install the necessary development packages
for XTEST (perhaps it is named something like libxtst-dev) and run
configure again.
==========================================================================
(cherry picked from commit 596b0d46e99c84dbe790d56dc3a4784ba06fdbdd)
commit 008bf3ac6b51c6b35dfcdd6e0d7594abe6e67448
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfburn: fixed build with recent glib2
(cherry picked from commit 95a3b86f6b51556d5bb962d7680245d5a9ada03b)
commit d9f8421a5d77c3d597abbdf0fbdf8f2a91d7b469
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind-tools: => 9.9.1-P2 (security)
(cherry picked from commit b30f06d64f7ae0b6b4d8740e3070f350272c6464)
commit 51f6ace7cebd3d35b370e2562f02d1ab0b8701df
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
rdesktop: dropped broken libvncserver dependency
(cherry picked from commit 367bcd1a92ce8a9194540f70868971b7e548c015)
commit 206396ff1da9b6cf3aa71159d645af7e87d27357
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk-chtheme: fixed build with gtk+2 >= 2.24
(cherry picked from commit 68f542d2f1a98f00125acefcb12f6e08e209254d)
commit 7aac879d15a44fcb6b32b03c71853ed857b5c536
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk+3: fixed compilation when cairo had been installed earlier than glib2
(cherry picked from commit 3d38e24b570307f8346d3fb8d099ea37a349257c)
Conflicts:
x11-toolkits/gtk+3/HISTORY
commit d1977fc3b58e5230b3c2f819f869f17ea0b34620
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: added glib2 subdependency
(cherry picked from commit b33a7e8a324c3056c7c8a5cf999554a10ac5e5da)
commit 75caffa82ad6038ada0bc18aa914ad53fe34b96e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: added depends xz-utils, it's not part of basesystem...
(cherry picked from commit 568a500b6e377a894abfc54876bceeb446744c28)
commit 24b324cb42adf97488721004764568bc2385aefd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xxkb: added missing imake dependency
(cherry picked from commit e2df88bb892561073cedb1b4068da5e6657d3a44)
commit d51419b3fbf2acde4b83669d21cea4a89fb69c67
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.8.1, SECURITY_PATCH=37
(cherry picked from commit b89cf872e65a4679b23974912c9dec92487a4832)
commit 5b4c091aed0aaf1faa536d2cb421cd930ed13373
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.8.0
(cherry picked from commit d9fce2f0a0b8ed4ebd0d2088991fec564a8ca3ef)
commit 995af7976c20ee983a2e8a34bcd9fe8a2e4fdc08
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
easystroke: added TRIGGERS to check_self when boost is cast
(cherry picked from commit af6c676be550f2ced7c3ac21cacbbafacce46d92)
commit 4fb47fd36a10b1d787f9c8a35ef147f9388f001b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
disk/fuse: unlock.patch now applies to stable branch only
(cherry picked from commit 2f78636d21727218c74284b662fad5ff481b9aa7)
commit 3d3ab2f082c85d13c457f3bf89f80aefbd2a0308
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.5
(cherry picked from commit d223235ea9f0f135ff07da3d086abe8938468aec)
commit 94e5b8c8150efdfe91348b4e1826c6bffd10f248
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
transcode: make it build again
(cherry picked from commit 06321465949d9bd57d54ab70711454b104646a52)
commit a3736b5ef8fe3d553a183ff9ebee221fb640bc3e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video/mplayer2: fixed scm branch dependencies
(cherry picked from commit 136880d68695a7994264186561b26f2f6723b302)
commit bc8dab914edd78e1f038b97e3b3f7e9949f1c1f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nsd: => 3.2.12 (security)
(cherry picked from commit ef8d06901ddc3c4c9f313b651b2647caf92915f7)
commit a11c0a223b847699293e04979db5044082b24b91
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpng 1.2.50, SECURITY_PATCH=9, CVE-2012-3386
(cherry picked from commit 05c806e9cd3694f1eb873b3b0563fe950f25ebe6)
commit 51f9e03cef68f913bc76be7801edc0ae63e03373
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.4.6
(cherry picked from commit ee0e6fd6797844bba52b16d924ccdeccd8f2d9cf)
commit 4efdbe06581277c60c9f000c50e89ad191a28984
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 14.0.1
(cherry picked from commit 33052f7d8d82024613392fd40c3a0fe364195d72)
commit 49d9970abe42f387191752eb61b81e86adb2609a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey 2.11, SECURITY_PATCH=44
(cherry picked from commit 42d5e0b2cb508adc798b913037782d8cfb5ccdb4)
commit 1d61fd0e19e13e662572a96c4a2078081c097349
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.10.1
(cherry picked from commit 516a846eec9f0999cfac28d798717b740f8ca1df)
commit 23d85c2aa9cad843a900978109a930eaac9ed334
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux => 3.0.37 (lts), 3.2.23 (lts)
(cherry picked from commit e68dd30f263629afd5e55c3722670beed5849bdd)
commit f4698ef0b1245a6277752a5c48c1489d9e9e4692
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
iasl: => 20120711
(cherry picked from commit 0dfbc06e3d6558df03c2c294f92f2fae12286111)
commit 77502235cb906d93c4c0c4bc9e172e34c0d80955
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.4.5
(cherry picked from commit d39986fff2b22957c06ff96332f53048c885e655)
commit 3aba4bf0e5214ed0d41d5889d38168dd99e4e1c7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: added more optional deps
(cherry picked from commit cc2ba40ecaf81ff087d5c20af4827f7b20194537)
commit cb25ae61cdc5c1d3339583fe96981eb28d69f1ed
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
samba: libcap becomes optional
(cherry picked from commit e67adddbb730022c0149de9bc4e15e228f4563a2)
Conflicts:
net/samba/HISTORY
commit decb40e9ca94dedc1820a6be77f3b09910def598
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
howl: spell deprecated [Replaced by avahi and no longer compiles for me.]
PATCHLEVEL=9999
Not sure if its possible to add a sub_depends to UP_TRIGGERS. I couldn't
find any documentation of it anyway.
(cherry picked from commit 0e09df962b462d08978ed6a98193baa5c8b9b4f6)
commit 96786799cf45c94f826c62e3d33e3357558cd8f0
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libdts: deprecated, forgot to commit ChangeLog
(cherry picked from commit 3846b3b2dc4a56af6bc197db5ef5f4dd8c479b70)
Conflicts:
ChangeLog
commit 2d23da6c0865911e28c868b0507b9d8bfc039718
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
commit a0445e5d41810a4b133129e461bd071a4c50d0a7
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libdts: spell deprecated [libdca replaced libdts a long time ago.]
PATCHLEVEL=9999
(cherry picked from commit e4dabd61260b6a760835fe05586b141f597b84e6)
commit ea1fd271b15397099e6ac2c004e8704da682e06f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xbmc: changed optional_depends libdts to libdca
(cherry picked from commit e0eeb94f3c8f313a63af6569a7c702b40ec7cbe8)
commit 5454f7bc0edb7231917d48875f0de28745a85dd5
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-libs: replaced optional_depends libdts with libdca
(cherry picked from commit 26a1ac8a57762c6b20dfeb9e544d5f677a129113)
commit df9bd700aedf8212c30ca8fd4f2ce334af00f3c7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xine-lib: => 1.2.2
(cherry picked from commit eaa0dc934aedd59ee5dad40aaf2b61019f8adc12)
commit 1e3ec3244a2e47b47fff668e5c745f0a35f6da35
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libfame: fix build
* PRE_BUILD: added to apply patches and run autoreconf
* BUILD: added to pass sse and mmx flags
* libfame-0.9.1-fstrict-aliasing.patch, libfame-0.9.1-underquoted.patch,
libfame-0.9.1-x86_64.patch: added, from RPMforge. Fixes build.
(cherry picked from commit 78055afc039b9142d5966fa594dde24205457fd4)
commit 7cd9305d26d0bd271e3170be03138f6353217600
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pilot-link: actually add files
(cherry picked from commit 0a433121fc5386811dd7b25aa2d41e3ac9315d60)
commit 4ff77394f762c03f66be4f0ab9b25b558e259d52
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pilot-link: fix compilation with perl>=5.14
(cherry picked from commit d896741dae69b0688934052ea360e86b1f66c003)
commit 9485c613cd7cabb342e6cb471e9f5b1b0619e98b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
evas configure options sdl updated
configure: WARNING: unrecognized options: --enable-software-sdl
(cherry picked from commit b0d08d022e8ec65a9f98e9580e1514d0b1fc504b)
commit de1bbdee149b35707a178a6e3e4c89cfc25e4a5f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssh: updated LPK patch to 6.0p1 (fixes #404)
(cherry picked from commit a2403d047dbefc9264417b313875767399c20a26)
commit df8a46cb72bf4b19573d05d4857de367af67fcab
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nautilus-dropbox: Depends on docutils
checking for docutils... no
configure: error: couldn't find docutils
(cherry picked from commit 0a61ba940e834a0d60356500e0a8b9a2ea88a5ab)
commit 81d5d533ad80b0404e720987491d43cb50f4fb7a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgpod: added optional_depends gtk-sharp-2 & udev
changed GTK2 to gdk-pixbuf2
(cherry picked from commit 9023f4a6ce2d14979fdaf9ff38b81e7a291cdfc9)
commit c09d7802e2149a109ab2b8e52b68bec9552e8bc5
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gtk-sharp-2: issue #407 - fix build with glib2 >= 2.31
(cherry picked from commit c62bc1b8f616f66c2506bcd9ccf0285724b15495)
commit a2628acdd9843d7a91917a281cea17c82d4c08d3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
automake 1.12.2, SECURITY_PATCH=1, CVE-2012-3386
(cherry picked from commit c293ba6f4b9f408b4519e86635169b92c17f3a75)
commit 0544291162d7099b53ec4afa5dbe35fedc6a980c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
automake 1.12.1
(cherry picked from commit 12e8a758f9f863b6502d64dfcc71c69e364b55fa)
commit e2aec0bc7c807fa7da01e88a76a1a60064a96782
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgnomeprint: fix compilation by adding missing header
* PRE_BUILD: added, to apply patch
* stdio.patch: added, patch to apply missing header.
(cherry picked from commit a7ba654b7a40cef8017daf407e3e1727e694f874)
commit aa984cdc70ee66f39a565529364033d59485ef15
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux-pam: switch to optional_depends for selinux to pass proper flags
* CONFIGURE: remove config_query for SELINUX
* INSTALL: fix commented out check for libselinux in case someone needs it
(cherry picked from commit 7863c993cae5487870ab7307551069f2340fb975)
commit 88b352796adc4a580a308b0057f041a85ec80104
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
vlc: apply lua 5.2 fixes
lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2. From
upstream. I assume this will be in the next major update
(cherry picked from commit 12b7177c30022be43384bd9c650c6c173292f0d5)
commit e3d8f7bdcb0968fe84a57c981e19bf1c4d266131
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pidgin 2.10.5, SECURITY_PATCH=15
(cherry picked from commit 0850d2cb782137b97fa704f37b013b4bff107dff)
commit 8738abf8849cb962eee366605c110596e1615a66
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.11.1 (stable)
(cherry picked from commit 85726cab7077fbcc97173708df44d0d2f3289cf6)
commit 17a6a94f02a84ccca19f76d75a9426ec7702ee0b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.7.13 (legacy)
(cherry picked from commit 782d679ffec0cec66582ecbcc060236e628a08a5)
commit 2ab78ae6952929c7440195ad6c9dd84fac89728d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: stable => 0.11
DEPENDS: dirac replaced by schroedinger in stable
yasm -> X86-assembler (--disable-yasm is still valid)
optional_depends libvpx added for stable
(cherry picked from commit 3360249b418f926ee4cda58058db80832c60ce19)
diff --git a/ChangeLog b/ChangeLog
index 739af3e..2d47e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * net/howl: spell deprecated
+ [Replaced by avahi and no longer compiles for me.]
+
+2012-07-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * audio-libs/libdts: spell deprecated
+ [libdca replaced libdts a long time ago.]
+
2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
- * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
+ * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
Upload <dict-upload AT aspell.net>"
- * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
+ * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
(Linux kernel stable release signing key)
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/VERSION b/VERSION
index efbad72..f988e77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-1
+0.61-2
diff --git a/audio-creation/supercollider/DEPENDS
b/audio-creation/supercollider/DEPENDS
index 543ef15..d84e7ff 100755
--- a/audio-creation/supercollider/DEPENDS
+++ b/audio-creation/supercollider/DEPENDS
@@ -1,4 +1,4 @@
depends scons &&
depends libsndfile &&
-depends howl &&
+depends -sub COMPAT_HOWL avahi &&
depends JACK-DRIVER
diff --git a/audio-creation/supercollider/HISTORY
b/audio-creation/supercollider/HISTORY
index fdbe902..a0cf109 100644
--- a/audio-creation/supercollider/HISTORY
+++ b/audio-creation/supercollider/HISTORY
@@ -1,3 +1,6 @@
+2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: howl -> -sub COMPAT_HOWL avahi
+
2010-10-19 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed so it downloads svn source
* DOWNLOAD: removed, we don't need DOWNLOAD file for svn
diff --git a/audio-libs/libdts/BUILD b/audio-libs/libdts/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/CONFLICTS b/audio-libs/libdts/CONFLICTS
deleted file mode 100755
index abc439c..0000000
--- a/audio-libs/libdts/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts libdca y
diff --git a/audio-libs/libdts/DETAILS b/audio-libs/libdts/DETAILS
index 1a66bbf..ed23bc5 100755
--- a/audio-libs/libdts/DETAILS
+++ b/audio-libs/libdts/DETAILS
@@ -1,17 +1,7 @@
- SPELL=libdts
- VERSION=0.0.2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://download.videolan.org/pub/videolan/$SPELL/$VERSION/$SOURCE
- WEB_SITE=http://www.videolan.org/dtsdec.html
-
SOURCE_HASH=sha512:b979aa2f5da5f6a0d56bac672c700b18393628b999a67b7a062a5f45233d357344308c6d194c6a723285dfb2072d6dc256e6b2fd9a68b9b865d6ca15d0583f60
- LICENSE[0]=GPL
- ENTERED=20040302
- KEYWORDS="streaming audio libs"
- SHORT="libdts is a free library for decoding DTS Coherent
Acoustics streams."
-cat << EOF
-libdts is a free library for decoding DTS Coherent Acoustics streams. It is
-released under the terms of the GPL license. The DTS Coherent Acoustics
-standard is used in a variety of applications, including DVD, DTS audio CD
and
-radio broadcasting.
-EOF
+ SPELL=libdts
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by libdca]
+ EOF
diff --git a/audio-libs/libdts/DOWNLOAD b/audio-libs/libdts/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libdts/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libdts/HISTORY b/audio-libs/libdts/HISTORY
index c61f000..e70f9d1 100644
--- a/audio-libs/libdts/HISTORY
+++ b/audio-libs/libdts/HISTORY
@@ -1,3 +1,8 @@
+2012-07-14 Sukneet Basuta <sukneet AT sourcemage.org>
+ * spell deprecated [libdca replaced libdts a long time ago.]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2007-09-29 Pol Vinogradov <vin.public AT gmail.com>
* CONFLICTS: added for libdca
config_query PAM_SECTTY "Install a default /etc/securetty?" n &&
-config_query PAM_SELINUX "Enable selinux support?" n &&
config_query PAM_DOCS "Build documentation?" n
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index 624982e..dac999b 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -4,13 +4,10 @@ depends cracklib &&
depends gnupg &&
depends smgl-fhs &&
-if [ "${PAM_SELINUX}" == "y" ]; then
- depends libselinux
-fi &&
-
if [ "${PAM_DOCS}" == "y" ]; then
depends texlive &&
depends linuxdoc-tools
fi
+optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support"
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index a06b8d7..de5fc5c 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,9 @@
+2012-07-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFIGURE: remove config_query for SELINUX
+ * DEPENDS: switch to optional_depends for selinux to pass proper
flags
+ * INSTALL: fix commented out check for libselinux in case
+ someone needs it
+
2011-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.5, SECURITY_PATCH=3 http://www.redhat.com/archives/pam-list/2011-October/msg00019.html
diff --git a/security-libs/linux-pam/INSTALL b/security-libs/linux-pam/INSTALL
index 05d02bc..131a9f3 100755
--- a/security-libs/linux-pam/INSTALL
+++ b/security-libs/linux-pam/INSTALL
@@ -6,7 +6,7 @@ fi &&
# this is a BUG, the SA should decide if/when selinux is configured
# properly. Activating it before that breaks login, which is BAD.
-#if [ "$PAM_SELINUX" == "y" ]; then
+#if is_depends_enabled $SPELL libselinux; then
# echo "session required pam_selinux.so multiple" >>
/etc/pam.d/login
#fi &&