Skip to Content.
Sympa Menu

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

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 (05ead7a48ea2be412e1beaac8d42e7115c22d8f4)
  • Date: Mon, 19 Jan 2015 09:30:37 -0600

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

ftp/axel/DETAILS | 1 +
ftp/axel/HISTORY | 6 ++++++
ftp/axel/PRE_BUILD | 8 +++++++-
ftp/axel/patches/axel-2.4-bffr-overflow.patch | 19 +++++++++++++++++++
ftp/axel/patches/axel-2.4-buildsystem.patch | 26
++++++++++++++++++++++++++
5 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 05ead7a48ea2be412e1beaac8d42e7115c22d8f4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

axel: SECURITY_PATCH++; security and build flags fixes

diff --git a/ftp/axel/DETAILS b/ftp/axel/DETAILS
index 4157c3f..e27f364 100755
--- a/ftp/axel/DETAILS
+++ b/ftp/axel/DETAILS
@@ -1,6 +1,7 @@
SPELL=axel
VERSION=2.4
PATCHLEVEL=1
+ SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3015/${SOURCE}

SOURCE_HASH=sha512:5cd8e63e325da6fe44ec213a2464e98dc68f9d43fe4b7200f5893b91b42fc1737b5e8d17709ee6d0d23cc74b68ab72f9f264b4bd941358b260f745ed6706d959
diff --git a/ftp/axel/HISTORY b/ftp/axel/HISTORY
index 312dce8..f40d596 100644
--- a/ftp/axel/HISTORY
+++ b/ftp/axel/HISTORY
@@ -1,3 +1,9 @@
+2015-01-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: Apply patches
+ * patches/axel-2.4-bffr-overflow.patch: Fixes potential buffer
overflow
+ * patches/axel-2.4-buildsystem.patch: Fixes build flags
+
2014-12-30 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Allow larger number of redirects, like wget
diff --git a/ftp/axel/PRE_BUILD b/ftp/axel/PRE_BUILD
index 734efbf..d3cfcbc 100755
--- a/ftp/axel/PRE_BUILD
+++ b/ftp/axel/PRE_BUILD
@@ -2,4 +2,10 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

# Allow larger number of redirections, like wget
-sed -ri '/^#define MAX_REDIR\>/ { s/[0-9]+$/20/ }' axel.h
+sed -ri '/^#define MAX_REDIR\>/ { s/[0-9]+$/20/ }' axel.h &&
+
+# Apply patches if any
+if [ -d "$SPELL_DIRECTORY/patches" ]; then
+ find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
+ -exec patch -fp1 -i '{}' \;
+fi
diff --git a/ftp/axel/patches/axel-2.4-bffr-overflow.patch
b/ftp/axel/patches/axel-2.4-bffr-overflow.patch
new file mode 100644
index 0000000..c44c375
--- /dev/null
+++ b/ftp/axel/patches/axel-2.4-bffr-overflow.patch
@@ -0,0 +1,19 @@
+From: Justin Lecher <jlec AT gentoo.org>
+Subject: Fix potential buffer overflow.
+
+http.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/http.c b/http.c
+index 5d64e9b..db91701 100644
+--- a/http.c
++++ b/http.c
+@@ -164,7 +164,7 @@ int http_exec( http_t *conn )
+ {
+ i ++;
+ }
+- strncat( conn->headers, s, MAX_QUERY );
++ strncat( conn->headers, s, MAX_QUERY - 1);
+ }
+
+ #ifdef DEBUG
diff --git a/ftp/axel/patches/axel-2.4-buildsystem.patch
b/ftp/axel/patches/axel-2.4-buildsystem.patch
new file mode 100644
index 0000000..46f2286
--- /dev/null
+++ b/ftp/axel/patches/axel-2.4-buildsystem.patch
@@ -0,0 +1,26 @@
+From: Justin Lecher <jlec AT gentoo.org>
+Subject: Fix build flags
+
+ Makefile | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1c3863a..b43fcff 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,13 +51,13 @@ uninstall-etc:
+ ### MAIN PROGRAM
+
+ $(OUTFILE): axel.o conf.o conn.o ftp.o http.o search.o tcp.o text.o
+- $(CC) *.o -o $(OUTFILE) $(LFLAGS)
++ $(CC) $(LDFLAGS) *.o -o $(OUTFILE) $(LFLAGS)
+ ifndef DEBUG
+ -$(STRIP) $(OUTFILE)
+ endif
+
+ .c.o:
+- $(CC) -c $*.c -o $*.o -Wall $(CFLAGS)
++ $(CC) $(CPPFLAGS) -c $*.c -o $*.o -Wall $(CFLAGS)
+
+ install-bin:
+ mkdir -p $(DESTDIR)$(BINDIR)/



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (05ead7a48ea2be412e1beaac8d42e7115c22d8f4), Ismael Luceno, 01/19/2015

Archive powered by MHonArc 2.6.24.

Top of Page