From 415856bdd4f48ab4f2732996f0bae58595092bbe Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 5 Apr 2011 14:26:38 +0000 Subject: Tue Apr 5 14:26:38 UTC 2011 --- extra/arj/001_arches_align.patch | 34 +++++ extra/arj/002_no_remove_static_const.patch | 20 +++ extra/arj/003_64_bit_clean.patch | 194 +++++++++++++++++++++++++++++ extra/arj/PKGBUILD | 54 ++++++++ extra/arj/arj-3.10.22-custom-printf.patch | 15 +++ 5 files changed, 317 insertions(+) create mode 100644 extra/arj/001_arches_align.patch create mode 100644 extra/arj/002_no_remove_static_const.patch create mode 100644 extra/arj/003_64_bit_clean.patch create mode 100644 extra/arj/PKGBUILD create mode 100644 extra/arj/arj-3.10.22-custom-printf.patch (limited to 'extra/arj') diff --git a/extra/arj/001_arches_align.patch b/extra/arj/001_arches_align.patch new file mode 100644 index 000000000..c55d17ec4 --- /dev/null +++ b/extra/arj/001_arches_align.patch @@ -0,0 +1,34 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c +--- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100 ++++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200 +@@ -2898,7 +2898,7 @@ + } + #endif + +-#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) ++#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) + /* Model-independent routine to get 2 bytes from far RAM */ + + unsigned int mget_word(char FAR *p) +diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h +--- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100 ++++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200 +@@ -12,7 +12,7 @@ + + #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) + #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) +-#ifndef WORDS_BIGENDIAN ++#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) + #define mget_word(p) (*(unsigned short *)(p)&0xFFFF) + #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) + #define mget_dword(p) (*(unsigned long *)(p)) +@@ -60,7 +60,7 @@ + void unpack_mem(struct mempack *mempack); + void strip_lf(char *str); + char *ltrim(char *str); +-#ifdef WORDS_BIGENDIAN ++#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) + unsigned int mget_word(char FAR *p); + unsigned long mget_dword(char FAR *p); + void mput_word(unsigned int w, char FAR *p); diff --git a/extra/arj/002_no_remove_static_const.patch b/extra/arj/002_no_remove_static_const.patch new file mode 100644 index 000000000..3656ba504 --- /dev/null +++ b/extra/arj/002_no_remove_static_const.patch @@ -0,0 +1,20 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.22.orig/gnu/makefile.in arj-3.10.22/gnu/makefile.in +--- arj-3.10.22.orig/gnu/makefile.in 2004-04-17 14:28:06.000000000 +0300 ++++ arj-3.10.22/gnu/makefile.in 2005-08-04 21:50:24.000000000 +0300 +@@ -192,6 +192,15 @@ + dispose: + + # ++# XXX: Do not use -O2, it removes the static const variable with gcc 4.x ++# ++ ++INTEGR_DIRS = $(ARJ_DIR) $(REARJ_DIR) $(ARJCRYPT_DIR) $(REGISTER_DIR) ++ ++$(patsubst %,%/integr.o, $(INTEGR_DIRS)): $(SRC_DIR)/integr.c ++ $(CC) -Wall -g -c -o$@ $< ++ ++# + # The tools + # + diff --git a/extra/arj/003_64_bit_clean.patch b/extra/arj/003_64_bit_clean.patch new file mode 100644 index 000000000..7cd602ea5 --- /dev/null +++ b/extra/arj/003_64_bit_clean.patch @@ -0,0 +1,194 @@ +#DPATCHLEVEL=1 +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_arcv.c arj-3.10.22/arj_arcv.c +--- arj-3.10.22.orig/arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 ++++ arj-3.10.22/arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 +@@ -59,27 +59,27 @@ + #define setup_hput(ptr) (tmp_hptr=(ptr)) + + #define hget_byte() (*(tmp_hptr++)&0xFF) +-#define hput_byte(c) (*(tmp_hptr++)=(char) (c)) ++#define hput_byte(c) (*(tmp_hptr++)=(uint8_t) (c)) + + /* Reads two bytes from the header, incrementing the pointer */ + +-static unsigned int hget_word() ++static uint16_t hget_word() + { +- unsigned int result; ++ uint16_t result; + + result=mget_word(tmp_hptr); +- tmp_hptr+=sizeof(short); ++ tmp_hptr+=sizeof(uint16_t); + return result; + } + + /* Reads four bytes from the header, incrementing the pointer */ + +-static unsigned long hget_longword() ++static uint32_t hget_longword() + { +- unsigned long result; ++ uint32_t result; + + result=mget_dword(tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + return result; + } + +@@ -87,18 +87,18 @@ + + /* Writes two bytes to the header, incrementing the pointer */ + +-static void hput_word(unsigned int w) ++static void hput_word(uint16_t w) + { + mput_word(w,tmp_hptr); +- tmp_hptr+=sizeof(unsigned short); ++ tmp_hptr+=sizeof(uint16_t); + } + + /* Writes four bytes to the header, incrementing the pointer */ + +-static void hput_longword(unsigned long l) ++static void hput_longword(uint32_t l) + { + mput_dword(l,tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + } + + /* Calculates and stores the basic header size */ +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c +--- arj-3.10.22.orig/arj_proc.c 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.c 2005-11-24 02:50:31.000000000 +0200 +@@ -585,7 +585,7 @@ + /* Returns the exact amount of data that could be safely written to the + destination volume */ + +-unsigned long get_volfree(unsigned int increment) ++unsigned long get_volfree(unsigned long increment) + { + unsigned long pvol; + unsigned int arjsec_overhead; +@@ -605,7 +605,7 @@ + remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- + (long)out_bytes-(long)cpos-(long)ext_voldata- + MULTIVOLUME_RESERVE-t_volume_offset; +- return((unsigned long)min(remain, (unsigned long)increment)); ++ return((unsigned long)min(remain, increment)); + } + + /* Performs various checks when multivolume data is packed to predict an +@@ -2466,14 +2466,14 @@ + *tsptr='\0'; + endptr=tsptr; + tsptr=sptr; +- while((unsigned int)tsptr<(unsigned int)endptr&&patterns>8 , p+1); +@@ -2931,7 +2931,7 @@ + + /* Model-independent routine to store 4 bytes in far RAM */ + +-void mput_dword(unsigned long d, char FAR *p) ++void mput_dword(uint32_t d, char FAR *p) + { + mput_word(d&0xFFFF, p); + mput_word(d>>16 , p+2); +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.h arj-3.10.22/arj_proc.h +--- arj-3.10.22.orig/arj_proc.h 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.h 2005-11-24 03:17:25.000000000 +0200 +@@ -8,15 +8,17 @@ + #ifndef ARJ_PROC_INCLUDED + #define ARJ_PROC_INCLUDED + ++#include ++ + /* Helper macros */ + +-#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) +-#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) ++#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF) ++#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c) + #if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) +-#define mget_word(p) (*(unsigned short *)(p)&0xFFFF) +-#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) +-#define mget_dword(p) (*(unsigned long *)(p)) +-#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w)) ++#define mget_word(p) (*(uint16_t *)(p)&0xFFFF) ++#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w)) ++#define mget_dword(p) (*(uint32_t *)(p)) ++#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w)) + #endif + + /* Prototypes */ +@@ -31,7 +33,7 @@ + int translate_path(char *name); + void restart_proc(char *dest); + int search_for_extension(char *name, char *ext_list); +-unsigned long get_volfree(unsigned int increment); ++unsigned long get_volfree(unsigned long increment); + unsigned int check_multivolume(unsigned int increment); + void store(); + void hollow_encode(); +@@ -61,10 +63,10 @@ + void strip_lf(char *str); + char *ltrim(char *str); + #if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) +-unsigned int mget_word(char FAR *p); +-unsigned long mget_dword(char FAR *p); +-void mput_word(unsigned int w, char FAR *p); +-void mput_dword(unsigned long d, char FAR *p); ++uint16_t mget_word(char FAR *p); ++uint32_t mget_dword(char FAR *p); ++void mput_word(uint16_t w, char FAR *p); ++void mput_dword(uint32_t d, char FAR *p); + #endif + + #endif diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD new file mode 100644 index 000000000..34012adae --- /dev/null +++ b/extra/arj/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 49803 2009-08-16 14:37:35Z jgc $ +# Maintainer: Travis Willard +# Contributor: Gergely Tamas + +pkgname=arj +pkgver=3.10.22 +pkgrel=5 +pkgdesc="Free and portable clone of the ARJ archiver" +url="http://arj.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +makedepends=('autoconf') +options=(!makeflags) +source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz + 001_arches_align.patch + 002_no_remove_static_const.patch + 003_64_bit_clean.patch + arj-3.10.22-custom-printf.patch) +md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' + '550bc972d825036f17f202a2b11b35c2' + '395dfa8cc500ffae648777f8f241be88' + '56b3cf96ec485b0d824761457417fcc0' + '4630a7254dfc6c8d8c7e696aa4a58f4a') +sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b' + '7f8904f8c89bacbbeec8c431d627efbb8da2f259' + '919a3c02a1e039803502c21175d69f7703d13026' + 'd506338e34b40ef5cac6ec14c858fd651a354aaf' + '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Add gentoo patches + patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1 + patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1 + patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1 + patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1 + + # Build! + cd gnu + aclocal || return 1 + autoconf || return 1 + rm -f config.{guess,sub} + _autover=$(automake --version | head -n1 | awk '{ print $4 }') + cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1 + ./configure --prefix=/usr || return 1 + cd .. + make prepare || return 1 + make || return 1 + + # Install! + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/arj/arj-3.10.22-custom-printf.patch b/extra/arj/arj-3.10.22-custom-printf.patch new file mode 100644 index 000000000..b789dd5c7 --- /dev/null +++ b/extra/arj/arj-3.10.22-custom-printf.patch @@ -0,0 +1,15 @@ +Patch by Lubomir Rintel for arj >= 3.10.22, which disables +the custom printf to avoid conflicting strnlen definition with the glibc +headers. By using custom printf (as in the past), we're completely loosing +all the _FORTIFY_SOURCE printf protections. + +--- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200 ++++ arj-3.10.22/fardata.c.printf 2009-04-18 16:23:52.000000000 +0200 +@@ -13,7 +13,6 @@ + /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp + correctly */ + #if SFX_LEVEL>=ARJ +- #define CUSTOM_PRINTF + #define CHUNK_SIZE 512 /* Size of the output block */ + #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */ + #endif -- cgit v1.2.3-54-g00ecf