Skip to Content.
Sympa Menu

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

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 (3f981c9f807e7dbc64acaf479f7eb097f4f3f18c)
  • Date: Sat, 16 Feb 2013 07:18:48 -0600

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

archive/burp/CONFIGURE | 4 ++++
archive/burp/DEPENDS | 13 +++++++++----
archive/burp/HISTORY | 6 ++++++
archive/burp/PRE_BUILD | 3 +++
archive/burp/init.d/burp | 7 ++++++-
archive/burp/init.d/burp.conf | 3 +++
crypto/nss/DETAILS | 5 ++++-
crypto/nss/HISTORY | 6 ++++++
crypto/nss/INSTALL | 6 ++++++
crypto/nss/UP_TRIGGERS | 4 ++++
10 files changed, 51 insertions(+), 6 deletions(-)

New commits:
commit 3f981c9f807e7dbc64acaf479f7eb097f4f3f18c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

burp: added ability to build and use statically linked binaries

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

nss: don't overwrite OpenSSL's libssl.a static library

diff --git a/archive/burp/CONFIGURE b/archive/burp/CONFIGURE
index f8a02a5..455cefa 100755
--- a/archive/burp/CONFIGURE
+++ b/archive/burp/CONFIGURE
@@ -2,6 +2,10 @@ config_query_option BURP_OPTS "Enable installing of include
files?" n \
"--enable-includes" \
"--disable-includes" &&

+config_query_option BURP_OPTS "Include statically linked binaries?" n \
+ "--enable-static --disable-libtool" \
+ "--disable-static --enable-libtool" &&
+
config_query_option BURP_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" \
"--disable-ipv6"
diff --git a/archive/burp/DEPENDS b/archive/burp/DEPENDS
index 4fe2fe7..1c2d215 100755
--- a/archive/burp/DEPENDS
+++ b/archive/burp/DEPENDS
@@ -35,10 +35,15 @@ optional_depends attr \
"--disable-xattr" \
"for xattr support" &&

-optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support" &&
+# use gettext functions from libc built with gettext support for static
binary
+if list_find "$BURP_OPTS" "--enable-static"; then
+ list_add BURP_OPTS "--disable-nls"
+else
+ optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support"
+fi &&

optional_depends tcp_wrappers \
"--with-tcp-wrappers" \
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
index 8c0f43c..987418a 100644
--- a/archive/burp/HISTORY
+++ b/archive/burp/HISTORY
@@ -1,3 +1,9 @@
+2013-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added option for static build
+ * DEPENDS: fixed gettext dependency for static build
+ * PRE_BUILD: fixed static build
+ * init.d/burp{,.conf}: include option to use statically linked binary
+
2013-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.24 (devel)

diff --git a/archive/burp/PRE_BUILD b/archive/burp/PRE_BUILD
index 20e4394..54bd406 100755
--- a/archive/burp/PRE_BUILD
+++ b/archive/burp/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+# remove non-required library from deprecated linking lines of Makefile
+sedit "s:-lgpm::g" src/Makefile.in &&
+
if [[ $INIT_INSTALLED ]]; then
sedit "s:^# user=.*:user=burp:" configs/server/burp.conf &&
sedit "s:^# group=.*:group=burp:" configs/server/burp.conf &&
diff --git a/archive/burp/init.d/burp b/archive/burp/init.d/burp
index a75f4cd..ee9fc89 100755
--- a/archive/burp/init.d/burp
+++ b/archive/burp/init.d/burp
@@ -2,7 +2,12 @@

. /etc/sysconfig/burp

-PROGRAM=/usr/sbin/burp
+if [[ $STATIC == "yes" ]] && [[ -x /usr/sbin/static-burp ]]; then
+ PROGRAM=/usr/sbin/static-burp
+else
+ PROGRAM=/usr/sbin/burp
+fi
+
PIDFILE=/var/run/burp/server.pid
ARGS="-c /etc/burp/burp-server.conf $BURP_ARGS"
RUNLEVEL=3
diff --git a/archive/burp/init.d/burp.conf b/archive/burp/init.d/burp.conf
index 69725ef..c58c63f 100644
--- a/archive/burp/init.d/burp.conf
+++ b/archive/burp/init.d/burp.conf
@@ -1,3 +1,6 @@
# For the arguments and description see burp(8)

BURP_ARGS=""
+
+# Set this to STATIC="yes" to use statically linked binary (if you enabled
it on cast)
+STATIC=
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index bebe74e..927790b 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -10,11 +10,12 @@ case $NSS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
- PATCHLEVEL=1
+ PATCHLEVEL=2
;;
3.12)
VERSION=3.12.11
SECURITY_PATCH=3
+ PATCHLEVEL=1
# FFVERSION=3.6.2
# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
@@ -30,12 +31,14 @@ case $NSS_BRANCH in
;;
3.13)
VERSION=3.13.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
;;
3.14)
VERSION=3.14.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 318e6ad..12f3f16 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2013-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: don't overwrite OpenSSL's libssl.a static library; renamed
+ libssl.a -> libssl3.a (according to installed libssl3.so shared lib)
+ * UP_TRIGGERS: added, for correct repairing sequence
+
2013-02-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.14.2

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index e1721e0..5b816d2 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,4 +1,10 @@
cd $SOURCE_DIRECTORY/mozilla/dist &&
+
+# don't overwrite OpenSSL's libssl.a static library
+cd */lib &&
+mv -v libssl.a libssl3.a &&
+cd $SOURCE_DIRECTORY/mozilla/dist &&
+
install -v -d -m755 $INSTALL_ROOT/usr/lib/nss &&
install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib &&
diff --git a/crypto/nss/UP_TRIGGERS b/crypto/nss/UP_TRIGGERS
new file mode 100755
index 0000000..9492e49
--- /dev/null
+++ b/crypto/nss/UP_TRIGGERS
@@ -0,0 +1,4 @@
+if spell_ok openssl && [[ ! -f $INSTALL_ROOT/usr/lib/libssl.a ]] || \
+ spell_ok $SPELL && [[ ! -f $INSTALL_ROOT/usr/lib/libssl3.a ]]; then
+ up_trigger openssl cast_self
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3f981c9f807e7dbc64acaf479f7eb097f4f3f18c), Vlad Glagolev, 02/16/2013

Archive powered by MHonArc 2.6.24.

Top of Page