Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (423fc72615afc845bbb05915e0b16d2818e92f78)

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 master grimoire by Vlad Glagolev (423fc72615afc845bbb05915e0b16d2818e92f78)
  • Date: Tue, 11 Oct 2011 17:48:16 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/nginx/BUILD | 5 +++++
http/nginx/DETAILS | 2 +-
http/nginx/HISTORY | 4 ++++
mobile/acpi-support/DEPENDS | 2 +-
mobile/acpi-support/HISTORY | 3 +++
mobile/laptop-mode-tools/DEPENDS | 2 +-
mobile/laptop-mode-tools/HISTORY | 3 +++
net/wicd/DEPENDS | 8 ++++----
net/wicd/HISTORY | 3 +++
utils/acpid2/DETAILS | 1 +
utils/acpid2/HISTORY | 5 +++++
utils/acpid2/PRE_BUILD | 5 +++++
utils/acpid2/dot-conf.patch | 11 +++++++++++
utils/hal/DEPENDS | 2 +-
utils/hal/HISTORY | 3 +++
wm-addons/wmacpimon/DEPENDS | 2 +-
wm-addons/wmacpimon/HISTORY | 3 +++
17 files changed, 55 insertions(+), 9 deletions(-)

New commits:
commit 423fc72615afc845bbb05915e0b16d2818e92f78
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: added new temp dirs for branches >=0.8

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

nginx: => 1.1.5 (devel)

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

wmacpimon: use ACPI provider

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

laptop-mode-tools: use ACPI provider

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

acpi-support: use ACPI provider

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

hal: use ACPI provider

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

wicd: use ACPI provider

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

acpid2: use regular *.conf files too

diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index 659a988..8212b2b 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -24,6 +24,11 @@ else
fi
fi &&

+if ! is_version_less $VERSION 0.8; then
+ OPTS="--http-uwsgi-temp-path=$TEMP_DIR/uwsgi_temp $OPTS" &&
+ OPTS="--http-scgi-temp-path=$TEMP_DIR/scgi_temp $OPTS"
+fi &&
+
./configure --prefix="$INSTALL_ROOT/etc/nginx" \
--conf-path="$INSTALL_ROOT/etc/nginx/nginx.conf" \
--sbin-path="$INSTALL_ROOT/usr/sbin/nginx" \
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index dcb5504..4348fcb 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -16,7 +16,7 @@ case "$NGINX_RELEASE" in
SECURITY_PATCH=2
;;
devel)
- VERSION=1.1.4
+ VERSION=1.1.5
;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index c1d9d56..3847505 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,7 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.5 (devel)
+ * BUILD: added new temp dirs for branches >=0.8
+
2011-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.8 (stable)

diff --git a/mobile/acpi-support/DEPENDS b/mobile/acpi-support/DEPENDS
index 0c2bd88..73238e1 100755
--- a/mobile/acpi-support/DEPENDS
+++ b/mobile/acpi-support/DEPENDS
@@ -1,4 +1,4 @@
-depends acpid &&
+depends ACPI &&
depends dmidecode &&
depends bsd-finger &&
depends hdparm &&
diff --git a/mobile/acpi-support/HISTORY b/mobile/acpi-support/HISTORY
index 74448d6..fba26c7 100644
--- a/mobile/acpi-support/HISTORY
+++ b/mobile/acpi-support/HISTORY
@@ -1,3 +1,6 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use ACPI provider
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/vbesave: made it non-sh, bug #13702
* init.d/acpi-support: made it non-sh, bug #13702
diff --git a/mobile/laptop-mode-tools/DEPENDS
b/mobile/laptop-mode-tools/DEPENDS
index cc49753..784b995 100755
--- a/mobile/laptop-mode-tools/DEPENDS
+++ b/mobile/laptop-mode-tools/DEPENDS
@@ -1,2 +1,2 @@
-depends acpid &&
+depends ACPI &&
optional_depends pm-utils '' '' 'to restore settings on resume'
diff --git a/mobile/laptop-mode-tools/HISTORY
b/mobile/laptop-mode-tools/HISTORY
index 6cd008e..367a17e 100644
--- a/mobile/laptop-mode-tools/HISTORY
+++ b/mobile/laptop-mode-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use ACPI provider
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/laptop-mode: made it non-sh, bug #13702

diff --git a/net/wicd/DEPENDS b/net/wicd/DEPENDS
index e1c925b..240ee7f 100755
--- a/net/wicd/DEPENDS
+++ b/net/wicd/DEPENDS
@@ -10,10 +10,10 @@ optional_depends urwid \
"" "--no-install-ncurses" \
"for ncurses client" &&

-optional_depends acpid "--resume=${INSTALL_ROOT}/etc/acpi/resume.d/ \
- --suspend=${INSTALL_ROOT}/etc/acpi/suspend.d/" \
- "--no-install-acpi" \
- "to install the suspend.d and resume.d acpi scripts"
&&
+optional_depends ACPI "--resume=${INSTALL_ROOT}/etc/acpi/resume.d/ \
+ --suspend=${INSTALL_ROOT}/etc/acpi/suspend.d/" \
+ "--no-install-acpi" \
+ "to install the suspend.d and resume.d acpi scripts" &&

optional_depends pm-utils
"--pmutils=${INSTALL_ROOT}/usr/lib/pm-utils/sleep.d/" \
"--no-install-pmutils" \
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index bb3ffa5..31aba5b 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,6 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use ACPI provider
+
2011-08-31 Bor Kraljič <pyrobor AT ver.si>
* BUILD: /opt/kde4 -> /usr

diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS
index 3b6b193..389e2fb 100755
--- a/utils/acpid2/DETAILS
+++ b/utils/acpid2/DETAILS
@@ -1,6 +1,7 @@
SPELL=acpid2
SPELLX=acpid
VERSION=2.0.12
+ PATCHLEVEL=1
SOURCE=$SPELLX-$VERSION.tar.gz

SOURCE_HASH=sha512:434050039cf57b5c0b2d20ab6f3fefa842f2fdcfdc783a6cb2058f941f2f55757c0dc744988010f3071c059659d82075ef18105615745d72fa3f15e78e7936cd
SOURCE_URL[0]=http://tedfelix.com/linux/$SOURCE
diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY
index 5122954..c0b8213 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,3 +1,8 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to apply the patch
+ * dot-conf.patch: added, to allow usage of regular *.conf files
+
2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, BUILD, INSTALL, CONFLICTS, PROVIDES, FINAL,
init.d/acpid{,.conf}: spell created
diff --git a/utils/acpid2/PRE_BUILD b/utils/acpid2/PRE_BUILD
new file mode 100755
index 0000000..e12eee1
--- /dev/null
+++ b/utils/acpid2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# allow regular *.conf files from /etc/acpi/event
+patch -p0 < "$SPELL_DIRECTORY/dot-conf.patch"
diff --git a/utils/acpid2/dot-conf.patch b/utils/acpid2/dot-conf.patch
new file mode 100644
index 0000000..37bc3f4
--- /dev/null
+++ b/utils/acpid2/dot-conf.patch
@@ -0,0 +1,11 @@
+--- event.c.orig 2011-08-04 02:54:26.000000000 +0400
++++ event.c 2011-10-12 01:35:09.000000000 +0400
+@@ -107,7 +107,7 @@
+ }
+
+ /* Compile the regular expression. This is based on run-parts(8). */
+- rc = regcomp(&preg, "^[a-zA-Z0-9_-]+$", RULE_REGEX_FLAGS);
++ rc = regcomp(&preg, "^[a-z0-9._-]+$", RULE_REGEX_FLAGS);
+ if (rc) {
+ acpid_log(LOG_ERR, "regcomp(): %d", rc);
+ unlock_rules();
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 9bea5a8..98bd3a8 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -75,7 +75,7 @@ optional_depends dmidecode \
"" \
"for dmidecode support" &&

-optional_depends acpid \
+optional_depends ACPI \
"--enable-acpi-acpid" \
"--disable-acpi-acpid" \
"for an acpid event source" &&
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index aedd101..fb0fe58 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use ACPI provider
+
2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply linux-2.6.38-v4l.patch
* linux-2.6.38-v4l.patch: Fix compilation with linux 2.6.38+ headers
diff --git a/wm-addons/wmacpimon/DEPENDS b/wm-addons/wmacpimon/DEPENDS
index f62fc6f..3ad0206 100755
--- a/wm-addons/wmacpimon/DEPENDS
+++ b/wm-addons/wmacpimon/DEPENDS
@@ -1 +1 @@
-depends acpid
+depends ACPI
diff --git a/wm-addons/wmacpimon/HISTORY b/wm-addons/wmacpimon/HISTORY
index 905ccaa..a736575 100644
--- a/wm-addons/wmacpimon/HISTORY
+++ b/wm-addons/wmacpimon/HISTORY
@@ -1,3 +1,6 @@
+2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use ACPI provider
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (423fc72615afc845bbb05915e0b16d2818e92f78), Vlad Glagolev, 10/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page