Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (55ab9936fc5642fa1ac94ee30a2a17eb347791cb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (55ab9936fc5642fa1ac94ee30a2a17eb347791cb)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (55ab9936fc5642fa1ac94ee30a2a17eb347791cb)
  • Date: Sat, 4 Jul 2015 20:47:23 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 5 +++++
FUNCTIONS | 3 ---
crypto/cryptsetup-luks/DETAILS | 6 +++---
crypto/cryptsetup-luks/HISTORY | 3 +++
dev/null |binary
devel/ninja-build-system/DETAILS | 4 ++--
devel/ninja-build-system/HISTORY | 3 +++
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
graphics/lensfun/DEPENDS | 2 +-
graphics/lensfun/DETAILS | 8 ++++----
graphics/lensfun/HISTORY | 3 +++
utils/logrotate/BUILD | 6 ------
utils/logrotate/DEPENDS | 13 ++++++++++++-
utils/logrotate/DETAILS | 5 ++---
utils/logrotate/HISTORY | 5 +++++
utils/logrotate/PRE_BUILD | 3 +++
17 files changed, 51 insertions(+), 25 deletions(-)

New commits:
commit 55ab9936fc5642fa1ac94ee30a2a17eb347791cb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 6.9.1-6

commit ce1a6af36b3ebaef08fc0bb99a1c893c39a55e52
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ninja-build-system: version 1.6.0

commit d07d7aea71a06d00cf06ccd500f1997550eb1887
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/lensfun: version 0.3.1

commit c45ecc49873c902fb34ab06f3f625fdb3a85262c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/cryptsetup-luks: version 1.6.7

commit 1078fb49fc61f7d015e0ddc2471517b765948b2f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

FUNCTIONS: do not cd explicitely into $SOURCE_DIRECTORY in qt5_build,
qt4_build and cmake_build

commit f8ed1e530f890bb7cc9bc057d48a567ab276cfe2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/logrotate: version 3.9.1

diff --git a/ChangeLog b/ChangeLog
index 8ac6a05..f82f2c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FUNCTIONS: do not cd into $SOURCE_DIRECTORY explicitely in
qt4_build,
+ qt5_build and cmake_build. It is the caller's job to do that.
+
2015-07-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* archive/lrzip: new spell, a compression program
+
2015-07-02 Vlad Glagolev <stealth AT sourcemage.org>
* accounts, groups: added account data for opensmtpd spell
* libs/libasr: new spell, free, simple and portable asynchronous
resolver
diff --git a/FUNCTIONS b/FUNCTIONS
index 7c70f0d..eb49dac 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -6,7 +6,6 @@ QT4DIR=$INSTALL_ROOT/opt/qt4
QT5DIR=$INSTALL_ROOT/opt/qt5

qt5_build() {
- cd $SOURCE_DIRECTORY &&
PATH="$QT5DIR/bin:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
@@ -541,7 +540,6 @@ function waf_install() {

# spells in several sections now need cmake or qt4
cmake_build() {
- cd "$SOURCE_DIRECTORY" &&
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
@@ -573,7 +571,6 @@ qt4_cmake_build() {
}

qt4_build() {
- cd $SOURCE_DIRECTORY &&
PATH="$QT4DIR/bin:$PATH"
qmake PREFIX=$QT4DIR $OPTS *.pro &&
make
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index f12744b..a62fbb0 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,11 +1,11 @@
SPELL=cryptsetup-luks
- VERSION=1.6.6
+ VERSION=1.6.7
BRANCH=v$(echo $VERSION | cut -f 1 -d .).$(echo $VERSION | cut -f
2 -d .)
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE=cryptsetup-$VERSION.tar.xz
-
SOURCE_HASH=sha256:2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f:UPSTREAM_HASH
+
SOURCE_HASH=sha256:c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820

SOURCE_URL[0]=http://www.kernel.org/pub/linux/utils/cryptsetup/$BRANCH/$SOURCE
- WEB_SITE=http://code.google.com/p/cryptsetup/
+ WEB_SITE=https://gitlab.com/cryptsetup/cryptsetup
ENTERED=20060117
LICENSE[0]=GPL
KEYWORDS="crypto"
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index a7c5dfd..d5685b0 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix WEB_SITE, version 1.6.7
+
2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: Do not export LIBS to the world.

diff --git a/devel/ninja-build-system/DETAILS
b/devel/ninja-build-system/DETAILS
index 3a5cae8..e047af6 100755
--- a/devel/ninja-build-system/DETAILS
+++ b/devel/ninja-build-system/DETAILS
@@ -1,6 +1,6 @@
SPELL=ninja-build-system
- VERSION=1.5.3
-
SOURCE_HASH=sha512:6d8cba5838d796bf50a17ca760498309477342422d1ad971e8fd030d4dd06aa9095ce27c2a02f89504cdf3aa5a8ba5af395a2c805b5c45e266a8250985212eea
+ VERSION=1.6.0
+
SOURCE_HASH=sha512:551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875
SOURCE="ninja-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/martine/ninja/archive/v${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/ninja-${VERSION}"
diff --git a/devel/ninja-build-system/HISTORY
b/devel/ninja-build-system/HISTORY
index ffb5e85..0c901dc 100644
--- a/devel/ninja-build-system/HISTORY
+++ b/devel/ninja-build-system/HISTORY
@@ -1,3 +1,6 @@
+2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.0
+
2015-02-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.3

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index d39985f..0566354 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,12 +1,12 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=6.9.1-2
+ VERSION=6.9.1-6
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/$SOURCE

SOURCE_URL[1]=http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/$SOURCE
-
SOURCE_HASH=sha512:894f49db4b5ec5d9a5e8d171439ff4ef94e4eda39d055978970c34b8e1daef2284b4c20ae85ab829422f2b403d8e697d0126076516a897acf47332a07c8b260b
+
SOURCE_HASH=sha512:3e2acba269649cfbc6f9b0d17a2b396a9417c6542cf02c9325c9749116d8cca44b3295e941422f701dabffc3df1e397d2c5cf9ee95ec0c79d24c8e9387353f15
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 03f01ac..d82e2ff 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.9.1-6
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.9.1-2

diff --git a/graphics/lensfun/DEPENDS b/graphics/lensfun/DEPENDS
index e106143..889995e 100755
--- a/graphics/lensfun/DEPENDS
+++ b/graphics/lensfun/DEPENDS
@@ -1,7 +1,7 @@
depends python &&
depends glib2 &&
depends cmake &&
-optional_depends libpng '-DBUILD_AUXFUN=ON' '-DBUILD_AUXFUN=OFF' 'build
AUXFUN library?' &&
+optional_depends libpng '-DBUILD_LENSTOOL=ON' '-DBUILD_LENSTOOL=OFF' 'build
lenstool?' &&
if [[ $LENSFUN_BRANCH == scm ]]; then
depends subversion
fi &&
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index 896ea99..30f2bd5 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -9,11 +9,11 @@ if [[ $LENSFUN_BRANCH == scm ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
else
- VERSION=0.3.0
-
SOURCE_HASH=sha512:2b0a57b3ae48401908d51372814424c1076d4219400935990af917f131e34261c44122773114c045a39db9062d6a0146cd44e20e3942d2bf3c281a5cc1494cc7
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.3.1
+
SOURCE_HASH=sha512:cd0f142bb7d6aa154f587d89502da35473a7a02660246bd025ccd5d1982f55425359405898e11ce9094351ad44a2d6786b9ff07d227f75699e99e4de8f40938c
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/${SPELL}/${VERSION}/${SOURCE}
fi
WEB_SITE=http://lensfun.sourceforge.net/
LICENSE[0]=GPL
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index ee3ae77..ad31155 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,6 @@
+2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 0.3.1
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/utils/logrotate/BUILD b/utils/logrotate/BUILD
deleted file mode 100755
index c476874..0000000
--- a/utils/logrotate/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-sed -i "s@\$(RPM_OPT_FLAGS)@$CFLAGS@" Makefile &&
-sed -i "s@BASEDIR = /usr@BASEDIR = $INSTALL_ROOT/usr@" Makefile &&
-sed -i "s@MANDIR = \$(BASEDIR)/man@MANDIR = \$(BASEDIR)/share/man@" \
- Makefile &&
-
-make
diff --git a/utils/logrotate/DEPENDS b/utils/logrotate/DEPENDS
index d8741d0..259d796 100755
--- a/utils/logrotate/DEPENDS
+++ b/utils/logrotate/DEPENDS
@@ -1 +1,12 @@
-depends popt
+depends popt &&
+depends autoconf &&
+depends automake &&
+depends libtool &&
+optional_depends acl \
+ "--with-acl=yes" \
+ "--with-acl=no" \
+ "for ACL support" &&
+optional_depends libselinux \
+ "--with-selinux=yes" \
+ "--with-selinux=no" \
+ "for SELinux support"
diff --git a/utils/logrotate/DETAILS b/utils/logrotate/DETAILS
index 7ceb2dd..7e13145 100755
--- a/utils/logrotate/DETAILS
+++ b/utils/logrotate/DETAILS
@@ -1,10 +1,9 @@
SPELL=logrotate
- VERSION=3.8.1
+ VERSION=3.9.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://fedorahosted.org/releases/l/o/$SPELL/$SOURCE
- SOURCE_HINTS="no-check-certificate"
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+
SOURCE_HASH=sha512:e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
WEB_SITE=https://fedorahosted.org/logrotate/
LICENSE[0]=GPL
ENTERED=20060328
diff --git a/utils/logrotate/HISTORY b/utils/logrotate/HISTORY
index 38043b9..ae9a06a 100644
--- a/utils/logrotate/HISTORY
+++ b/utils/logrotate/HISTORY
@@ -1,3 +1,8 @@
+2015-07-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 3.9.1
+ * BUILD: removed
+ * PRE_BUILD: run autotools
+
2012-03-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.8.1; renewed source url, website,
license

diff --git a/utils/logrotate/PRE_BUILD b/utils/logrotate/PRE_BUILD
new file mode 100755
index 0000000..cd8a40b
--- /dev/null
+++ b/utils/logrotate/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+./autogen.sh
diff --git a/utils/logrotate/logrotate-3.8.1.tar.gz.sig
b/utils/logrotate/logrotate-3.8.1.tar.gz.sig
deleted file mode 100644
index 48c901e..0000000
Binary files a/utils/logrotate/logrotate-3.8.1.tar.gz.sig and /dev/null differ


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (55ab9936fc5642fa1ac94ee30a2a17eb347791cb), Florian Franzmann, 07/04/2015

Archive powered by MHonArc 2.6.24.

Top of Page