Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (7336d3b43623c5df93321ff346784db4cb5fe110)
  • Date: Sat, 19 Mar 2016 13:02:42 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/cryptsetup-luks/DETAILS | 4 -
crypto/cryptsetup-luks/HISTORY | 3 +
crypto/pinentry/BUILD | 2
crypto/pinentry/DETAILS | 2
crypto/pinentry/HISTORY | 4 +
devel/pkgconfig/BUILD | 1
devel/pkgconfig/DETAILS | 4 -
devel/pkgconfig/HISTORY | 4 +
shell-term-fm/bash/DETAILS | 10 ++--
shell-term-fm/bash/HISTORY | 4 +
shell-term-fm/bash/patches/bash43-040 | 47 ++++++++++++++++++++++
shell-term-fm/bash/patches/bash43-041 | 72
++++++++++++++++++++++++++++++++++
shell-term-fm/bash/patches/bash43-042 | 55 +++++++++++++++++++++++++
utils/util-linux/DETAILS | 6 +-
utils/util-linux/HISTORY | 3 +
15 files changed, 207 insertions(+), 14 deletions(-)

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

crypto/pinentry: version 0.9.7

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

devel/pkgconfig: version 0.29.1

commit 6570c79e817e5a938862f47c281bb668c52f9bfa
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.7.1

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

utils/util-linux: version 2.27.1

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

shell-term-fm/bash: apply official patches 40-42

diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index a62fbb0..bb3ae1d 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
SPELL=cryptsetup-luks
- VERSION=1.6.7
+ VERSION=1.7.1
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:c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820
+
SOURCE_HASH=sha256:73dc8a63cc984b56aa6a3c99f355262471bcfe78b3240b8b9d0caa8002911fec

SOURCE_URL[0]=http://www.kernel.org/pub/linux/utils/cryptsetup/$BRANCH/$SOURCE
WEB_SITE=https://gitlab.com/cryptsetup/cryptsetup
ENTERED=20060117
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index d5685b0..0566656 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2016-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.1
+
2015-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix WEB_SITE, version 1.6.7

diff --git a/crypto/pinentry/BUILD b/crypto/pinentry/BUILD
index d1de6e3..1efe08f 100755
--- a/crypto/pinentry/BUILD
+++ b/crypto/pinentry/BUILD
@@ -1 +1 @@
-OPTS="$OPTS $PINENTRY_CURSES $PINENTRY_TTY" MOC="$QTDIR/bin/moc"
CXXFLAGS="-std=c++11 ${CXXFLAGS}" default_build
+OPTS="$OPTS $PINENTRY_CURSES $PINENTRY_TTY"
MOC="${TRACK_ROOT}/opt/qt4/bin/moc" CXXFLAGS="-std=c++11 ${CXXFLAGS}"
default_build
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index 26c353f..d8f79bc 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,5 +1,5 @@
SPELL=pinentry
- VERSION=0.9.6
+ VERSION=0.9.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index ec88c45..b4d0a95 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,7 @@
+2016-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.7
+ * BUILD: fix path to moc
+
2015-11-18 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: updated spell to 0.9.6
fixed WEB_SITE
diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
index 344ab34..2831915 100755
--- a/devel/pkgconfig/BUILD
+++ b/devel/pkgconfig/BUILD
@@ -2,4 +2,5 @@
# subsequently be built when pkg-config is also broken due to linking to
# system glib2.
OPTS="$OPTS --with-internal-glib" &&
+OPTS="$OPTS
--with-pc-path=/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/qt4/lib/pkgconfig"
&&
default_build
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index a3f6e51..c6db9f3 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,6 +1,6 @@
SPELL=pkgconfig
- VERSION=0.29
-
SOURCE_HASH=sha512:c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63
+ VERSION=0.29.1
+
SOURCE_HASH=sha512:d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 2adbea3..e667562 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2016-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.29.1
+ * BUILD: add /opt/qt4/lib/pkgconfig to search path
+
2016-01-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.29

diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index 20530d8..36fe22e 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,13 +1,13 @@
SPELL=bash
- VERSION=4.3
+ VERSION=4.3-041
+ XVERSION=${VERSION%%-*}
SECURITY_PATCH=8
- PATCHLEVEL=1
- BASH_PATCHLEVEL=039
- SOURCE=$SPELL-$VERSION.tar.gz
+ BASH_PATCHLEVEL=${VERSION#*-}
+ SOURCE=$SPELL-$XVERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=$SPELL-doc-3.2.tar.gz
SOURCE4=$SOURCE3.sig
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$XVERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE3_URL[0]=$GNU_URL/$SPELL/$SOURCE3
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 5b9c04a..5610bba 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2016-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, patches/bash43-04[123]: apply official patches, make patch
number
+ part of VERSION
+
2015-06-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* patches/bash43-03[1-9]: added official patches
diff --git a/shell-term-fm/bash/patches/bash43-040
b/shell-term-fm/bash/patches/bash43-040
new file mode 100644
index 0000000..978ce1c
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-040
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-040
+
+Bug-Reported-by: Jean Delvare <jdelvare AT suse.de>
+Bug-Reference-ID: <20150609180231.5f463695 AT endymion.delvare>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00033.html
+
+Bug-Description:
+
+There is a memory leak that occurs when bash expands an array reference on
+the rhs of an assignment statement.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400
+--- subst.c 2015-06-22 09:16:53.000000000 -0400
+***************
+*** 5783,5787 ****
+ if (pflags & PF_ASSIGNRHS)
+ {
+! temp = array_variable_name (name, &tt, (int *)0);
+ if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
+ temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype,
&ind);
+--- 5783,5787 ----
+ if (pflags & PF_ASSIGNRHS)
+ {
+! var = array_variable_part (name, &tt, (int *)0);
+ if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
+ temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype,
&ind);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 39
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 40
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-041
b/shell-term-fm/bash/patches/bash43-041
new file mode 100644
index 0000000..a040a2a
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-041
@@ -0,0 +1,72 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-041
+
+Bug-Reported-by: Hanno Böck <hanno AT hboeck.de>
+Bug-Reference-ID: <20150623131106.6f111da9@pc1>,
<20150707004640.0e61d2f9@pc1>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00089.html,
+
http://lists.gnu.org/archive/html/bug-bash/2015-07/msg00018.html
+
+Bug-Description:
+
+There are several out-of-bounds read errors that occur when completing
command
+lines where assignment statements appear before the command name. The first
+two appear only when programmable completion is enabled; the last one only
+happens when listing possible completions.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3.40/bashline.c 2014-12-29 14:39:43.000000000 -0500
+--- bashline.c 2015-08-12 10:21:58.000000000 -0400
+***************
+*** 1469,1476 ****
+--- 1469,1489 ----
+ os = start;
+ n = 0;
++ was_assignment = 0;
+ s = find_cmd_start (os);
+ e = find_cmd_end (end);
+ do
+ {
++ /* Don't read past the end of rl_line_buffer */
++ if (s > rl_end)
++ {
++ s1 = s = e1;
++ break;
++ }
++ /* Or past point if point is within an assignment statement */
++ else if (was_assignment && s > rl_point)
++ {
++ s1 = s = e1;
++ break;
++ }
+ /* Skip over assignment statements preceding a command name. If we
+ don't find a command name at all, we can perform command name
+*** ../bash-4.3.40/lib/readline/complete.c 2013-10-14 09:27:10.000000000
-0400
+--- lib/readline/complete.c 2015-07-31 09:34:39.000000000 -0400
+***************
+*** 690,693 ****
+--- 690,695 ----
+ if (temp == 0 || *temp == '\0')
+ return (pathname);
++ else if (temp[1] == 0 && temp == pathname)
++ return (pathname);
+ /* If the basename is NULL, we might have a pathname like '/usr/src/'.
+ Look for a previous slash and, if one is found, return the portion
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 40
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 41
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-042
b/shell-term-fm/bash/patches/bash43-042
new file mode 100644
index 0000000..472c605
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-042
@@ -0,0 +1,55 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-042
+
+Bug-Reported-by: Nathan Neulinger <nneul AT neulinger.org>
+Bug-Reference-ID: <558EFDF2.7060402 AT neulinger.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00096.html
+
+Bug-Description:
+
+There is a problem when parsing command substitutions containing `case'
+commands within pipelines that causes the parser to not correctly identify
+the end of the command substitution.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400
+--- parse.y 2015-06-29 10:59:27.000000000 -0400
+***************
+*** 3709,3712 ****
+--- 3709,3714 ----
+ tflags |= LEX_INWORD;
+ lex_wlen = 0;
++ if (tflags & LEX_RESWDOK)
++ lex_rwlen = 0;
+ }
+ }
+*** ../bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400
+--- y.tab.c 2015-06-29 10:59:27.000000000 -0400
+***************
+*** 6021,6024 ****
+--- 6021,6026 ----
+ tflags |= LEX_INWORD;
+ lex_wlen = 0;
++ if (tflags & LEX_RESWDOK)
++ lex_rwlen = 0;
+ }
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 41
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 42
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 3f96d10..91a64b2 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -12,11 +12,11 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.27
-
SOURCE_HASH=sha512:06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c
+ VERSION=2.27.1
+
SOURCE_HASH=sha512:a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8
SECURITY_PATCH=2
fi
- BRANCH=`echo $VERSION | cut -d- -f 1`
+ BRANCH=`echo $VERSION | cut -d. -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index c618482..b72fb85 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.27.1
+
2015-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.27
* depends: add optional readline



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7336d3b43623c5df93321ff346784db4cb5fe110), Florian Franzmann, 03/19/2016

Archive powered by MHonArc 2.6.24.

Top of Page