Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (305a303c62a776be82ef9986683a8f970bd541a7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (305a303c62a776be82ef9986683a8f970bd541a7)
  • Date: Wed, 18 Nov 2015 16:43:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/gpa/DETAILS | 2 +-
crypto/gpa/HISTORY | 3 +++
crypto/gpgme/DETAILS | 5 +++++
crypto/gpgme/HISTORY | 3 +++
crypto/gpgme/PREPARE | 2 +-
crypto/libassuan/DETAILS | 2 +-
crypto/libassuan/HISTORY | 3 +++
crypto/pinentry/BUILD | 10 ----------
crypto/pinentry/DEPENDS | 12 ++++++------
crypto/pinentry/DETAILS | 4 ++--
crypto/pinentry/HISTORY | 6 ++++++
crypto/pinentry/INSTALL | 2 +-
12 files changed, 32 insertions(+), 22 deletions(-)

New commits:
commit 305a303c62a776be82ef9986683a8f970bd541a7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pinentry 0.9.6

commit d3b8121bcb8ea41d45a86b8b871e66c0c75566a0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libassuan 2.4.0

commit 2bfd00da0c2bb307f45bee455b7456cd8fc156bc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpgme 1.6.0

commit 1516eb5f053c6e9e28c2892c15dc727d9e580750
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpa 0.9.9

diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index 6f07692..b99134b 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -8,7 +8,7 @@ if [ "$GPA_BRANCH" == "scm" ]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
else
- VERSION=0.9.7
+ VERSION=0.9.9

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index 9873d4e..e718068 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2015-11-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.9
+
2015-01-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.9.7

diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index b8f9ab4..4e73ebc 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -38,6 +38,11 @@ case $GPGME_BRANCH in
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
;;
+ 1.6)
+ VERSION=1.6.0
+
SOURCE_HASH=sha512:b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ ;;
esac

SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 46dee78..f2ddc03 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2015-11-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated GPGME_BRANCH=1.6 to 1.6.0
+
2015-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.5

diff --git a/crypto/gpgme/PREPARE b/crypto/gpgme/PREPARE
index 1a23a2d..e134389 100755
--- a/crypto/gpgme/PREPARE
+++ b/crypto/gpgme/PREPARE
@@ -13,7 +13,7 @@ if [[ $GPGME_OLD == n ]]; then
persistent_remove GPGME_OLD
fi

-config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5
+config_query_list GPGME_BRANCH "Which branch of GPGME do you want to build?"
DEFAULT 0.3 1.0 1.1 1.2 1.3 1.4 1.5 1.6

###
# 2006-07-07
diff --git a/crypto/libassuan/DETAILS b/crypto/libassuan/DETAILS
index fd44ed2..5eede37 100755
--- a/crypto/libassuan/DETAILS
+++ b/crypto/libassuan/DETAILS
@@ -1,5 +1,5 @@
SPELL=libassuan
- VERSION=2.2.1
+ VERSION=2.4.0

SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/libassuan/$SOURCE
diff --git a/crypto/libassuan/HISTORY b/crypto/libassuan/HISTORY
index dcec2cc..1786ff4 100644
--- a/crypto/libassuan/HISTORY
+++ b/crypto/libassuan/HISTORY
@@ -1,3 +1,6 @@
+2015-11-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.0
+
2015-05-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.1

diff --git a/crypto/pinentry/BUILD b/crypto/pinentry/BUILD
index 5f65bd4..d1de6e3 100755
--- a/crypto/pinentry/BUILD
+++ b/crypto/pinentry/BUILD
@@ -1,11 +1 @@
-# fix bad moc files
-if is_depends_enabled $SPELL qt4;then
- export QTDIR=$INSTALL_ROOT/opt/qt4 &&
- export PATH=$QTDIR/bin:$PATH &&
- export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig/ &&
- cd qt4 &&
- moc pinentrydialog.h > pinentrydialog.moc &&
- moc qsecurelineedit.h > qsecurelineedit.moc &&
- cd ..
-fi &&
OPTS="$OPTS $PINENTRY_CURSES $PINENTRY_TTY" MOC="$QTDIR/bin/moc"
CXXFLAGS="-std=c++11 ${CXXFLAGS}" default_build
diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index 3a492c6..95b3032 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -9,10 +9,10 @@ optional_depends libsecret \
"--disable-libsecret" \
"cache passphrases using libsecret" &&

-optional_depends libx11
\
- ""
\
- "--disable-pinentry-gtk2 --disable-pinentry-qt4" \
- "for X11 support (needed for GTK+2/QT4 support)"
&&
+optional_depends libx11 \
+ "" \
+ "--disable-pinentry-gtk2 --disable-pinentry-qt" \
+ "for X11 support (needed for GTK+2/QT4 support)" &&

if is_depends_enabled "$SPELL" "libx11"; then
optional_depends gtk+2 \
@@ -21,7 +21,7 @@ if is_depends_enabled "$SPELL" "libx11"; then
"to build GTK+2 pinentry" &&

optional_depends qt4 \
- "--enable-pinentry-qt4" \
- "--disable-pinentry-qt4" \
+ "--enable-pinentry-qt" \
+ "--disable-pinentry-qt" \
"to build Qt4 pinentry"
fi
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index 6395cab..26c353f 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,5 +1,5 @@
SPELL=pinentry
- VERSION=0.9.5
+ VERSION=0.9.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -7,7 +7,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html
+ WEB_SITE=http://gnupg.org/
ENTERED=20030326
LICENSE[0]=GPL
KEYWORDS="crypto"
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index 920cdf3..ec88c45 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,9 @@
+2015-11-18 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: updated spell to 0.9.6
+ fixed WEB_SITE
+ Removed fixing of moc files, not needed anymore
+ s/-qt4/-qt/
+
2015-08-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.5
* PRE_BUILD, 0001-fix-curses-include.patch: deleted
diff --git a/crypto/pinentry/INSTALL b/crypto/pinentry/INSTALL
index 3d5d80e..38a436d 100755
--- a/crypto/pinentry/INSTALL
+++ b/crypto/pinentry/INSTALL
@@ -1,4 +1,4 @@
default_install &&
if is_depends_enabled $SPELL qt4; then
- patchelf --set-rpath /opt/qt4/lib "${INSTALL_ROOT}/usr/bin/pinentry-qt4"
+ patchelf --set-rpath /opt/qt4/lib "${INSTALL_ROOT}/usr/bin/pinentry-qt"
fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (305a303c62a776be82ef9986683a8f970bd541a7), Ismael Luceno, 11/18/2015

Archive powered by MHonArc 2.6.24.

Top of Page