Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (09f9c26294e3fca9aea27f41f86f97ba2b83e75b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (09f9c26294e3fca9aea27f41f86f97ba2b83e75b)
  • Date: Fri, 18 Jan 2013 19:48:46 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 7 ++++++
accounts | 1
archive/burp/BUILD | 8 ++++++
archive/burp/CONFIGURE | 7 ++++++
archive/burp/DEPENDS | 49
++++++++++++++++++++++++++++++++++++++++++
archive/burp/DETAILS | 37 +++++++++++++++++++++++++++++++
archive/burp/HISTORY | 3 ++
archive/burp/INSTALL | 12 ++++++++++
archive/burp/PREPARE | 2 +
archive/burp/PRE_BUILD | 12 ++++++++++
archive/burp/init.d/burp | 16 +++++++++++++
archive/burp/init.d/burp.conf | 3 ++
crypto/polarssl/BUILD | 3 +-
crypto/polarssl/DEPENDS | 2 +
crypto/polarssl/DETAILS | 4 +--
crypto/polarssl/HISTORY | 5 ++++
crypto/polarssl/INSTALL | 3 --
crypto/polarssl/PRE_BUILD | 6 -----
gnu.gpg |binary
groups | 1
libs/gettext/BUILD | 18 ++-------------
libs/gettext/DETAILS | 3 --
libs/gettext/HISTORY | 5 ++++
libs/gettext/PRE_BUILD | 4 ---
x11-libs/fontconfig/DETAILS | 4 +--
x11-libs/fontconfig/HISTORY | 3 ++
x11-libs/wine/DETAILS | 2 -
x11-libs/wine/HISTORY | 3 ++
28 files changed, 187 insertions(+), 36 deletions(-)

New commits:
commit 40e91d900e03de0681deb9c03eba3b011cd0bde4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated devel to 1.5.22

commit 37b8687a85ed7ea8b428d5fab36491ae9797bf71
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fontconfig: => 2.10.2

commit 6eb6a5a337864a582f003364caaad6be07b8ebbe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gettext: => 0.18.2

commit 64d976bc65b791a7d467063c45b33473274c149d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ChangeLog - add key for Daiki Ueno

commit 0931c47e92317881a1fde96a900ada54c4ad7042
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

polarssl: => 1.2.3

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

added account data for burp

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

burp: new spell, network backup and restore program

diff --git a/ChangeLog b/ChangeLog
index c58ce41..b9ce247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * archive/burp: new spell, network backup and restore program
+ * accounts, groups: added account data for burp
+
+2013-01-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * gnu.gpg: add key A1534B85 "Daiki Ueno <ueno AT unixuser.org>"
+
2013-01-16 Ladislav Hagara <hgr AT vabo.cz>
* video/v4l2ucp: new spell, universal control panel for V4L2 devices

diff --git a/accounts b/accounts
index 7cc238f..d0d80d3 100755
--- a/accounts
+++ b/accounts
@@ -97,4 +97,5 @@ nslcd:188:189
redis:189:190
lightdm:191:191
masqmail:192:192
+burp:193:194
nobody:65534:65534
diff --git a/archive/burp/BUILD b/archive/burp/BUILD
new file mode 100755
index 0000000..d23a16c
--- /dev/null
+++ b/archive/burp/BUILD
@@ -0,0 +1,8 @@
+create_account burp &&
+
+OPTS="--sysconfdir=$INSTALL_ROOT/etc/burp \
+ --sbindir=$INSTALL_ROOT/usr/sbin \
+ $BURP_OPTS \
+ $OPTS" &&
+
+default_build
diff --git a/archive/burp/CONFIGURE b/archive/burp/CONFIGURE
new file mode 100755
index 0000000..f8a02a5
--- /dev/null
+++ b/archive/burp/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_option BURP_OPTS "Enable installing of include files?" n \
+ "--enable-includes" \
+ "--disable-includes" &&
+
+config_query_option BURP_OPTS "Enable IPv6 support?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6"
diff --git a/archive/burp/DEPENDS b/archive/burp/DEPENDS
new file mode 100755
index 0000000..4fe2fe7
--- /dev/null
+++ b/archive/burp/DEPENDS
@@ -0,0 +1,49 @@
+depends -sub CXX gcc &&
+depends librsync &&
+depends zlib &&
+
+if [[ $BURP_BRANCH == scm ]]; then
+ depends git
+fi &&
+
+# TODO: missing uthash spell in grimoire
+# optional_depends uthash "" "" "to use system uthash library" &&
+
+if spell_ok ncurses; then
+ depends ncurses
+else
+ optional_depends ncurses "" "" "to support live monitor on the server"
+fi &&
+
+optional_depends openssl \
+ "--with-openssl" \
+ "--without-openssl" \
+ "for encrypted communication" &&
+
+optional_depends openafs \
+ "--enable-afs" \
+ "--disable-afs" \
+ "for AFS support" &&
+
+optional_depends acl \
+ "--enable-acl" \
+ "--disable-acl" \
+ "for acl support" &&
+
+optional_depends attr \
+ "--enable-xattr" \
+ "--disable-xattr" \
+ "for xattr support" &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+optional_depends tcp_wrappers \
+ "--with-tcp-wrappers" \
+ "--without-tcp-wrappers" \
+ "for tcpwrappers support" &&
+
+suggest_depends SYSTEM-LOGGER "" "" "to use syslog for logging" &&
+suggest_depends SENDMAIL "" "" "to send notifications via e-mail"
diff --git a/archive/burp/DETAILS b/archive/burp/DETAILS
new file mode 100755
index 0000000..9b3aeb3
--- /dev/null
+++ b/archive/burp/DETAILS
@@ -0,0 +1,37 @@
+ SPELL=burp
+if [[ $BURP_BRANCH == scm ]]; then
+ if [[ $BURP_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ FORCE_DOWNLOAD=on
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://github.com/grke/burp.git:$SPELL
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+elif [[ $BURP_BRANCH == devel ]]; then
+ VERSION=1.3.22
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:e0cac535abd6a8aad84ad5633961b11793c0d6bd98d74ddb57f3f47721b1fa57825818d5257b066d6099b93a45333bbe03a800cb96e402e2b770ea9e502f0c7e
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+else
+ VERSION=1.3.10
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:ed540ed4091c7c1b0aeaf62b276e7fe07f4ae1ca92c67a3eb081c431b687b7aba6d6648a0f3d7ec122ae02d39fd5ed03ed263a68285fd3423615079844e8217f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+fi
+ WEB_SITE=http://burp.grke.net/
+ ENTERED=20130118
+ LICENSE[0]=AGPL
+ KEYWORDS="archive"
+ SHORT="network backup and restore program"
+cat << EOF
+Burp is a network backup and restore program. It uses librsync in order to
save
+network traffic and to save on the amount of space that is used by each
backup.
+
+It also uses VSS (Volume Shadow Copy Service) to make snapshots when backing
up
+Windows computers.
+EOF
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
new file mode 100644
index 0000000..10f50f2
--- /dev/null
+++ b/archive/burp/HISTORY
@@ -0,0 +1,3 @@
+2013-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, CONFIGURE, PREPARE, {PRE_,}BUILD, INSTALL,
+ init.d/burp{,.conf}: spell created
diff --git a/archive/burp/INSTALL b/archive/burp/INSTALL
new file mode 100755
index 0000000..2b1efd8
--- /dev/null
+++ b/archive/burp/INSTALL
@@ -0,0 +1,12 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SPELL_DIRECTORY/init.d/burp.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/burp" &&
+
+ install -d -o burp -g burp -vm 755 "$INSTALL_ROOT/var/run/burp" &&
+
+ # change owner to root config dir (not recursively!)
+ # so startup script can generate SSL certificates
+ chown burp:burp "$INSTALL_ROOT/etc/burp"
+fi
diff --git a/archive/burp/PREPARE b/archive/burp/PREPARE
new file mode 100755
index 0000000..40600f7
--- /dev/null
+++ b/archive/burp/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/archive/burp/PRE_BUILD b/archive/burp/PRE_BUILD
new file mode 100755
index 0000000..20e4394
--- /dev/null
+++ b/archive/burp/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $INIT_INSTALLED ]]; then
+ sedit "s:^# user=.*:user=burp:" configs/server/burp.conf &&
+ sedit "s:^# group=.*:group=burp:" configs/server/burp.conf &&
+ sedit "s:/var/run/burp.server:/var/run/burp/server:"
configs/server/burp.conf
+fi &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SYSTEM-LOGGER); then
+ sedit "s:syslog = 0:syslog = 1:" configs/server/burp.conf
+fi
diff --git a/archive/burp/init.d/burp b/archive/burp/init.d/burp
new file mode 100755
index 0000000..bd9bdc2
--- /dev/null
+++ b/archive/burp/init.d/burp
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+. /etc/sysconfig/burp
+
+PROGRAM=/usr/sbin/burp
+PIDFILE=/var/run/burp.server.pid
+ARGS="-c /etc/burp/burp-server.conf $BURP_ARGS"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
+
+stop() {
+ _stop
+ rm -f "$PIDFILE"
+}
diff --git a/archive/burp/init.d/burp.conf b/archive/burp/init.d/burp.conf
new file mode 100644
index 0000000..69725ef
--- /dev/null
+++ b/archive/burp/init.d/burp.conf
@@ -0,0 +1,3 @@
+# For the arguments and description see burp(8)
+
+BURP_ARGS=""
diff --git a/crypto/polarssl/BUILD b/crypto/polarssl/BUILD
index 8f58e6d..80aaeaf 100755
--- a/crypto/polarssl/BUILD
+++ b/crypto/polarssl/BUILD
@@ -1 +1,2 @@
-make
+OPTS+=" -DUSE_SHARED_POLARSSL_LIBRARY=1"
+cmake_build
diff --git a/crypto/polarssl/DEPENDS b/crypto/polarssl/DEPENDS
new file mode 100755
index 0000000..2a0f37c
--- /dev/null
+++ b/crypto/polarssl/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+optional_depends zlib '-DENABLE_ZLIB_SUPPORT=1' '' 'zlib support'
diff --git a/crypto/polarssl/DETAILS b/crypto/polarssl/DETAILS
index d10cc02..78da2c9 100755
--- a/crypto/polarssl/DETAILS
+++ b/crypto/polarssl/DETAILS
@@ -1,8 +1,8 @@
SPELL=polarssl
- VERSION=1.1.1
+ VERSION=1.2.3
+
SOURCE_HASH=sha512:917c27ba312acfd4418ccd9f0259f7fbca96248a8865c3b329134c3a9f26ef2cba5e0dac9c4f6fc95583f94ea77acde255f2d4f1913f165bb859e1153b09aab8
SOURCE=$SPELL-$VERSION-gpl.tgz
SOURCE_URL[0]=http://polarssl.org/code/releases/$SOURCE
-
SOURCE_HASH=sha512:832cde2a103d9a97b8238bd2c41afa779543c5d50cc3cf6a4fa69bf382a3c4341b00980e04eb96346080137bbf266d82e8ae602ea68bbd3cac528cb1a5252ff1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://polarssl.org/
LICENSE[0]=GPL
diff --git a/crypto/polarssl/HISTORY b/crypto/polarssl/HISTORY
index e78331a..255d523 100644
--- a/crypto/polarssl/HISTORY
+++ b/crypto/polarssl/HISTORY
@@ -1,3 +1,8 @@
+2013-01-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.3
+ * BUILD, DEPENDS: use cmake, zlib
+ * INSTALL, PRE_BUILD: deleted
+
2012-01-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.1
* INSTALL: added
diff --git a/crypto/polarssl/INSTALL b/crypto/polarssl/INSTALL
deleted file mode 100755
index fc2fc6d..0000000
--- a/crypto/polarssl/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-
-ln -sfn $INSTALL_ROOT/usr/lib/libpolarssl.so
$INSTALL_ROOT/usr/lib/libpolarssl.so.0
diff --git a/crypto/polarssl/PRE_BUILD b/crypto/polarssl/PRE_BUILD
deleted file mode 100755
index d16f366..0000000
--- a/crypto/polarssl/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sed -i "s:DESTDIR=/usr/local:DESTDIR=$INSTALL_ROOT/usr:" Makefile &&
-sed -i "s:# CFLAGS += -fPIC:CFLAGS += -fPIC:" library/Makefile &&
-sed -i "s/all: static/all: static shared/" library/Makefile
diff --git a/gnu.gpg b/gnu.gpg
index a0450f4..a8870b8 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/groups b/groups
index 4989ea0..c64f2b5 100755
--- a/groups
+++ b/groups
@@ -118,5 +118,6 @@ redis:190:
lightdm:191:
masqmail:192:
bumblebee:193:
+burp:194:
users:1000:
nogroup:65534:
diff --git a/libs/gettext/BUILD b/libs/gettext/BUILD
index fcdbecd..9918937 100755
--- a/libs/gettext/BUILD
+++ b/libs/gettext/BUILD
@@ -5,20 +5,10 @@ OPTS="--enable-threads=posix $OPTS" &&

# never rely on external glib2
OPTS="--with-included-glib $OPTS" &&
+# use this version of getext
+OPTS+=" --with-included-gettext" &&

-make_single &&
-
-./configure --build=$BUILD \
- --host=$HOST \
- --prefix=${TRACK_ROOT}/usr \
- --sysconfdir=${TRACK_ROOT}/etc \
- --infodir=${TRACK_ROOT}/usr/share/info \
- --mandir=${TRACK_ROOT}/usr/share/man \
- --with-included-gettext \
- --includedir=${TRACK_ROOT}/usr/local/include \
- $OPTS &&
-
-make &&
+default_build &&

if is_depends_enabled $SPELL tetex; then
cd gettext-tools/doc &&
@@ -28,8 +18,6 @@ if is_depends_enabled $SPELL tetex; then
cd -
fi &&

-make_normal &&
-
#
# Remove libintl.h from old log files
#
diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index 4a8bee0..1a6bf45 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,6 +1,5 @@
SPELL=gettext
- VERSION=0.18.1.1
- PATCHLEVEL=1
+ VERSION=0.18.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 5f9b20f..5a87381 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,8 @@
+2013-01-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.18.2
+ * BUILD: cleanup and simplify
+ * PRE_BUILD: deleted , builds ok with glibc-2.17
+.
2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with glibc 2.16

diff --git a/libs/gettext/PRE_BUILD b/libs/gettext/PRE_BUILD
deleted file mode 100755
index 32353b6..0000000
--- a/libs/gettext/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h
diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index e83282e..fca07d8 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -1,6 +1,6 @@
SPELL=fontconfig
- VERSION=2.10.1
-
SOURCE_HASH=sha512:b9640323e0c03d5463654732562de369d4968c9dedeb3f6415071a323ffcdd1abd8de12bf2e1719fa2a2d8df3fa2000989a9b7f5dcd6977a356df4c1eae1a01e
+ VERSION=2.10.2
+
SOURCE_HASH=sha512:d8886b3bb40790591120ae7701efa7430dcb8c171eaa9bac3c42fe62cb0c9646c66aded49a8683a4299e2dbeda90dbf4ca09bb53075f9c089f95097135142cb6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.fontconfig.org/release/$SOURCE
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index a27983f..e343cf9 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2013-01-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.10.2
+
2012-09-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10.1

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index b451e06..684a4f8 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.5.21
+ VERSION=1.5.22
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index a15fd4c..3c88c37 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-01-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.5.22
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.5.21




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (09f9c26294e3fca9aea27f41f86f97ba2b83e75b), Eric Sandall, 01/18/2013

Archive powered by MHonArc 2.6.24.

Top of Page