Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e7e41fe8ca1164bd6ad73edb228d1d05e97aef27)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e7e41fe8ca1164bd6ad73edb228d1d05e97aef27)
  • Date: Wed, 15 Aug 2007 11:09:42 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird/DEPENDS | 6 ---
database/firebird/DETAILS | 8 -----
database/firebird/HISTORY | 9 +++++
database/firebird/PREPARE | 22 ++++++++++++--
database/firebird/fb1.5.patch.bz2 | 0
database/firebird/init.d/firebird15 | 55
------------------------------------
dev/null |binary
graphics/libgphoto2/DETAILS | 1
graphics/libgphoto2/HISTORY | 9 +++++
graphics/libgphoto2/INSTALL | 38 +++++-------------------
libs/libcap/DETAILS | 12 ++++++-
libs/libcap/HISTORY | 9 +++++
python-devel/sqlalchemy/DETAILS | 4 +-
python-devel/sqlalchemy/HISTORY | 5 ++-
14 files changed, 71 insertions(+), 107 deletions(-)

New commits:
commit 7ccb954c6443c00f03771aa06ebd4ae5f15fc3a0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgphoto2 - fix install

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

libcap-1.97

commit 6388f9ff69ff8b139344d8d2678c8f9b334d31a9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird - remove support for v1.5

commit 991426f8bb754fbda51f72c0d191b3f066513158
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sqlalchemy-0.4.0beta2

diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index c7c06f9..57b1342 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -4,12 +4,6 @@ depends openssl &&
depends libmcrypt &&
depends ncurses &&
case $FB_VER in
- 1.5) depends bison &&
- optional_depends libedit \
- "--with-editline" \
- "--without-editline" \
- "for fancy line editing"
- ;;
2.0) depends bison &&
depends icu &&
optional_depends libedit \
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 336efe6..a0a7bad 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -8,14 +8,6 @@ case $FB_VER in
# SOURCE_IGNORE=volatile
# FORCE_DOWNLOAD=on
#;;
- 1.5)
-# VERSION=1.5.3.4870
- VERSION=1.5.4.4910
-
SOURCE_HASH=sha512:a42aebeabf3152e9b84c7e4fa5b728feb3588bc535ed1c8901b8ab3bc7a3c83b36a26f99bc11bcc2094888c13aea0ae16cbd55b1c284508a295f7611fdae3cb3
- SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
-;;
2.1)
VERSION=2.1.0.15999-Beta1
SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index ca7fcb2..1ff0194 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,12 @@
+2007-08-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE, DETAILS, PRE_BUILD, DEPENDS: remove fb1.5 support
+ it is considered obsolete by the Firebird project
+ * REPAIR^a0c257655c2c986a126a1e0c0297d97a^volatiles: set x bit
+ * fb1.5.patch.bz2, init.d/firebird15: deleted
+
+2007-07-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: add a mention of Firebird-2.1 changes
+
2007-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* services: remove obsolete file

diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 35fe234..a9b64c7 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,14 +7,17 @@ cat <<EOF
After installing firebird, you should change the default password for the
SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VER "which version to build?(2.1 is EXPERIMENTAL)" 2.0
1.5 2.1
+config_query_list FB_VER "which version to build?(2.1 is EXPERIMENTAL)" 2.0
2.1

# warn of major changes
if spell_ok firebird;then
local FB_PREV
FB_PREV=`installed_version firebird | cut -d. -f-2`
- if [ $FB_PREV = 1.5 ] && [ $FB_VER != 1.5 ];then
- cat <<EOF
+
+ if [[ $FB_PREV !=$FB_VER ]];then
+ case $FB_VER in
+ 2.0)
+ cat <<EOF
Firebird 2 includes ODS changes, intended to improve database
performance.
These improvements are only available in databases using the new ODS.
So, before uninstalling a previous Firebird version, make a backup
using gbak.
@@ -27,6 +30,19 @@ if spell_ok firebird;then
Then, after installing firebird2, read the instructions in
/usr/firebird/upgrade/security_database.txt
EOF
+ ;;
+ 2.1)
+ cat <<EOF
+ there are some differences between Firebird versions 2.0 and 2.1
+ after installation please read the file
+ /usr/firebird/upgrade/metadata_charset.txt
+EOF
+ ;;
+ 1.5)
+ /bin/echo downgrading to version 1.5 is not supported
+ return 1
+ ;;
+ esac
if ! query "do you really want to upgrade firebird?";then
return 1
fi
diff --git
a/database/firebird/REPAIR^a0c257655c2c986a126a1e0c0297d97a^volatiles
b/database/firebird/REPAIR^a0c257655c2c986a126a1e0c0297d97a^volatiles
old mode 100644
new mode 100755
diff --git a/database/firebird/fb1.5.patch.bz2
b/database/firebird/fb1.5.patch.bz2
deleted file mode 100644
index 325bafc..0000000
Binary files a/database/firebird/fb1.5.patch.bz2 and /dev/null differ
diff --git a/database/firebird/init.d/firebird15
b/database/firebird/init.d/firebird15
deleted file mode 100755
index 0140aab..0000000
--- a/database/firebird/init.d/firebird15
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# description: Start/Stop firebird15 database server
-#
-# This file belongs in /etc/init.d where it will be run
-# on system startup and shutdown to start the background
-# Firebird database Super server daemon
-
-
-ISC_USER=SYSDBA
-ISC_PASSWORD=masterkey
-FBRunUser=firebird
-FB=/usr/firebird/bin/fbmgr.bin
-#export FB
-export ISC_USER
-export ISC_PASSWORD
-# WARNING: in a real-world installation, you should not put the
-# SYSDBA password in a publicly-readable file.
-# Eventually this file should not need to contain any passwords.
-# as root user alone should be sufficient privledge to stop/start
-# the server.
-
-source /etc/init.d/smgl_functions
-
-PROGRAM=/bin/false
-RUNLEVEL=3
-NEEDS="+network +remote_fs"
-
-case $1 in
- start)
- echo "Starting Firebird Super Server"
- mkdir -p /var/run/firebird
- chown firebird:firebird /var/run/firebird
- su -l "$FBRunUser" -s /bin/sh -m -c "$FB -start -forever"
- evaluate_retval
- ;;
- stop)
- echo "Stopping Firebird server"
- $FB -shut
- evaluate_retval
- ;;
-
- restart|reload)
- echo "Restarting Firebird server"
- $0 stop
- $0 start
- evaluate_retval
- ;;
- *)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
-
-
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 026bb61..f7f92cd 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://gphoto.sourceforge.net/proj/libgphoto2/
ENTERED=20030125
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="gPhotolib2 - for gPhoto2"
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 55ba36a..13d6b71 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,5 +1,12 @@
+2007-08-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL: fix install of hal-fdi data, breaks hal-0.5.9.1
+ fix creation of udev rule
+ add missing &&
+ delete old comments
+
2007-07-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.3.0
+ * DETAILS: version 2.4.0

2007-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.1
diff --git a/graphics/libgphoto2/INSTALL b/graphics/libgphoto2/INSTALL
index 39b2233..b49aa1e 100755
--- a/graphics/libgphoto2/INSTALL
+++ b/graphics/libgphoto2/INSTALL
@@ -2,13 +2,15 @@ default_install &&
cd doc &&
make install-man &&

-local CAMERALIST &&
-CAMERALIST=$INSTALL_ROOT/usr/lib/libgphoto2/print-camera-list &&
+local CAMERALIST &&
+CAMERALIST=$TRACK_ROOT/usr/lib/libgphoto2/print-camera-list &&
# Installs fdi files for use with HAL
if spell_ok hal; then
- local
FDI=${INSTALL_ROOT}/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi
&&
- $CAMERALIST hal-fdi >$FDI
-fi
+ message "\nInstalling hal fdi data" &&
+ local FDI=${INSTALL_ROOT}/usr/share/hal/fdi/information/10freedesktop
&&
+ mkdir -p $FDI &&
+ $CAMERALIST hal-fdi >$FDI/10-camera-libgphoto2.fdi
+fi &&

# Produce a udev rules file for all the cameras
if spell_ok udev; then
@@ -19,30 +21,8 @@ if spell_ok udev; then
local RULE_DIR="$INSTALL_ROOT/etc/udev/rules.d"

message "\nInstalling udev rules file in $RULE_DIR/$RULE\n"
-# echo -e "ACTION==\"add\", SUBSYSTEM==\"usb_device\", \
-#PROGRAM=\"/bin/sh -c 'K=%k; K=\$\${K#usbdev}; printf bus/usb/%%03i/%%03i
\$\${K%%%%.*} \$\${K#*.}'\", \
-#NAME=\"%c\", MODE=\"0644\"\n \
-#\n\
-#SUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"gphoto_rules_end\"\n" >
$TMP_RULE
-
-$CAMERALIST udev-rules $GP_RUN > $TMP_RULE &&
-# $INSTALL_ROOT/usr/lib/libgphoto2/print-camera-list usb-usermap usbcam >
$MAP
-
-# local PRODUCT
-# local VENDOR
-# while read LINE; do
-# if echo $LINE | grep -q "^#"; then
-# echo $LINE >> $TMP_RULE
-# else
-# PRODUCT=$(echo $LINE | cut -f3 -d' ')
-# VENDOR=$(echo $LINE | cut -f4 -d' ')
-# echo "SYSFS{idVendor}==\"${PRODUCT#0x}\",
SYSFS{idProduct}==\"${VENDOR#0x}\", GROUP=\"video\", MODE=\"660\"" >>
$TMP_RULE
-# fi
-# done < $MAP
-
-# echo -e "\nLABEL=\"gphoto_rules_end\"" >> $TMP_RULE
-
- install -m 644 $TMP_RULE $RULE_DIR
+ $CAMERALIST udev-rules script $GP_RUN > $TMP_RULE &&
+ install -m 644 $TMP_RULE $RULE_DIR &&
rm -f $TMP_RULE $MAP
else
# Else we fallback on the old method using hotplug stuff
diff --git a/libs/libcap/DETAILS b/libs/libcap/DETAILS
index 3487021..931a07f 100755
--- a/libs/libcap/DETAILS
+++ b/libs/libcap/DETAILS
@@ -1,9 +1,17 @@
SPELL=libcap
+KVER=$(installed_version linux | cut -c-3)
+if [[ $KVER == 2.4 ]];then
VERSION=1.10
+else
+ VERSION=1.97
+fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/$SOURCE
-
SOURCE_HASH=sha512:038f4fea5a71b156139dece213c6aafb0fb6908ddc7b3ec55f621b5ebfeb35ea4351080afbe8b2be142d800d85e91423d1144b5983fa725444abb7bcfccd91b9
+
SOURCE_URL[0]=http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-${KVER}/$SOURCE
+ SOURCE2=$SOURCE.sign
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
+ SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://sourceforge.net/projects/linux-privs/
ENTERED=20040330
diff --git a/libs/libcap/HISTORY b/libs/libcap/HISTORY
index d46a229..1ae94b9 100644
--- a/libs/libcap/HISTORY
+++ b/libs/libcap/HISTORY
@@ -1,3 +1,12 @@
+2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.97 / 1.10
+ support 2.4 kernes as well
+
+2007-08-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.96
+ convert to gpg check
+ use version for 2.6 kernel
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/python-devel/sqlalchemy/DETAILS b/python-devel/sqlalchemy/DETAILS
index 3f8d4a6..5bf6e3c 100755
--- a/python-devel/sqlalchemy/DETAILS
+++ b/python-devel/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.3.10
-
SOURCE_HASH=sha512:8326cb02b9d66c08fd6f6036c353d627198cf51957887db3b57aa65deaec4682f0dfff4864d16da163dd508ca61d733e2a4a654c81281d572a5f7eb1e7204a80
+ VERSION=0.4.0beta2
+
SOURCE_HASH=sha512:9d81e11da805e0a02ed510d5f1c51ce76aafc421738f5ce3a079ad5eb9432885e615bc4e728669e841ada78217581a041574521b482cf0ea98d399391f382b74
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-devel/sqlalchemy/HISTORY b/python-devel/sqlalchemy/HISTORY
index 280c578..4bcd615 100644
--- a/python-devel/sqlalchemy/HISTORY
+++ b/python-devel/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.0beta2
+
2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version
+ * DETAILS: version 0.3.10
spell created



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e7e41fe8ca1164bd6ad73edb228d1d05e97aef27), Treeve Jelbert, 08/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page