Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them. With hat: portmgr Sponsored by: Absolight
This commit is contained in:
parent
5a20e7990e
commit
9fa9eb9ac7
@ -1,5 +1,5 @@
|
|||||||
--- registryd/registry-main.c.orig 2010-02-27 00:19:33.000000000 -0500
|
--- registryd/registry-main.c.orig 2010-09-09 02:51:14 UTC
|
||||||
+++ registryd/registry-main.c 2010-02-27 00:21:10.000000000 -0500
|
+++ registryd/registry-main.c
|
||||||
@@ -198,6 +198,7 @@ main (int argc, char **argv)
|
@@ -198,6 +198,7 @@ main (int argc, char **argv)
|
||||||
* has been set. If we have not been relocated, we will exit if the
|
* has been set. If we have not been relocated, we will exit if the
|
||||||
* at-spi-dbus key has been set.
|
* at-spi-dbus key has been set.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./Src/DasherCore/DasherViewSquare.h.orig 2013-05-24 17:03:27.185956866 +0200
|
--- Src/DasherCore/DasherViewSquare.h.orig 2009-04-27 15:05:29 UTC
|
||||||
+++ ./Src/DasherCore/DasherViewSquare.h 2013-05-24 17:03:36.904410678 +0200
|
+++ Src/DasherCore/DasherViewSquare.h
|
||||||
@@ -20,11 +20,6 @@
|
@@ -20,11 +20,6 @@ namespace Dasher {
|
||||||
class CDasherNode;
|
class CDasherNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12,9 +12,9 @@
|
|||||||
/// \ingroup View
|
/// \ingroup View
|
||||||
/// @{
|
/// @{
|
||||||
|
|
||||||
--- ./Src/DasherCore/SettingsStore.h.orig 2013-05-24 16:53:08.087996232 +0200
|
--- Src/DasherCore/SettingsStore.h.orig 2009-04-27 15:05:30 UTC
|
||||||
+++ ./Src/DasherCore/SettingsStore.h 2013-05-24 16:53:40.137994206 +0200
|
+++ Src/DasherCore/SettingsStore.h
|
||||||
@@ -18,9 +18,6 @@
|
@@ -18,9 +18,6 @@ namespace Dasher {
|
||||||
class CParameterNotificationEvent;
|
class CParameterNotificationEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -24,9 +24,9 @@
|
|||||||
// Types that are parameters can be
|
// Types that are parameters can be
|
||||||
enum ParameterType
|
enum ParameterType
|
||||||
{
|
{
|
||||||
--- ./Src/DasherCore/View/DelayedDraw.h.orig 2013-05-24 17:00:06.589967502 +0200
|
--- Src/DasherCore/View/DelayedDraw.h.orig 2009-04-27 15:05:30 UTC
|
||||||
+++ ./Src/DasherCore/View/DelayedDraw.h 2013-05-24 16:57:01.492979337 +0200
|
+++ Src/DasherCore/View/DelayedDraw.h
|
||||||
@@ -15,8 +15,6 @@
|
@@ -15,8 +15,6 @@ namespace Dasher {
|
||||||
class CDasherScreen;
|
class CDasherScreen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
--- Makefile.in.orig 2007-01-19 00:01:09.000000000 +0000
|
--- Makefile.in.orig 2007-01-19 00:01:09 UTC
|
||||||
+++ Makefile.in
|
+++ Makefile.in
|
||||||
@@ -34,7 +34,7 @@ eflite: fs.o es.o soccon.o sockopen.o to
|
@@ -34,7 +34,7 @@ eflite: fs.o es.o soccon.o sockopen.o to
|
||||||
$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
|
$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- docs/reference/Makefile.in.orig 2009-08-09 02:49:17.000000000 +0200
|
--- docs/reference/Makefile.in.orig 2010-10-30 14:17:09 UTC
|
||||||
+++ docs/reference/Makefile.in 2009-08-09 02:54:54.000000000 +0200
|
+++ docs/reference/Makefile.in
|
||||||
@@ -418,8 +418,6 @@
|
@@ -443,8 +443,6 @@ uninstall-am: uninstall-local
|
||||||
|
|
||||||
html/index.html:
|
html/index.html:
|
||||||
-rm -rf html
|
-rm -rf html
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- configure.orig Tue Jun 7 02:40:27 2005
|
--- configure.orig 2009-02-15 17:43:46 UTC
|
||||||
+++ configure Tue Jun 7 02:41:02 2005
|
+++ configure
|
||||||
@@ -20213,8 +20213,8 @@
|
@@ -21415,8 +21415,8 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
if test "x$JAVAC" != "x" ; then
|
if test "x$JAVAC" != "x" ; then
|
||||||
@ -11,11 +11,11 @@
|
|||||||
JAVAC="$JAVAC -source 1.4"
|
JAVAC="$JAVAC -source 1.4"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -20423,6 +20423,7 @@
|
@@ -21634,6 +21634,7 @@ fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Find the Java Access Bridge
|
# Find the Java Access Bridge
|
||||||
+JAB="no"
|
+JAB="no"
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-jab_dir or --without-jab_dir was given.
|
# Check whether --with-jab_dir was given.
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- ./src/clients/spdsend/server.c.orig 2012-07-11 11:05:05.000000000 +0200
|
--- src/clients/spdsend/server.c.orig 2015-05-07 23:19:02 UTC
|
||||||
+++ ./src/clients/spdsend/server.c 2013-11-15 08:44:05.105354858 +0100
|
+++ src/clients/spdsend/server.c
|
||||||
@@ -33,6 +33,7 @@
|
@@ -33,6 +33,7 @@
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
@ -23,7 +23,6 @@ NLS_USES= gettext
|
|||||||
NLS_CONFIGURE_ENABLE= nls
|
NLS_CONFIGURE_ENABLE= nls
|
||||||
OPTIONS_DEFINE= DOCS NLS
|
OPTIONS_DEFINE= DOCS NLS
|
||||||
OPTIONS_SUB= yes
|
OPTIONS_SUB= yes
|
||||||
EXTRA_PATCHES= ${FILESDIR}/extra-patch-yasr__main.c
|
|
||||||
|
|
||||||
PLIST_FILES= bin/yasr \
|
PLIST_FILES= bin/yasr \
|
||||||
man/man1/yasr.1.gz \
|
man/man1/yasr.1.gz \
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- ./yasr/main.c.orig 2013-11-11 18:44:59.238198747 -0500
|
--- yasr/main.c.orig 2007-09-23 00:46:58 UTC
|
||||||
+++ ./yasr/main.c 2013-11-11 18:45:09.927197900 -0500
|
+++ yasr/main.c
|
||||||
@@ -24,11 +24,7 @@
|
@@ -24,11 +24,7 @@
|
||||||
|
|
||||||
#include "yasr.h"
|
#include "yasr.h"
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.in.orig 2013-09-25 23:27:38.000000000 +0800
|
--- Makefile.in.orig 2009-03-17 16:26:28 UTC
|
||||||
+++ Makefile.in 2013-09-25 23:28:25.000000000 +0800
|
+++ Makefile.in
|
||||||
@@ -83,15 +83,15 @@ debinstall: components
|
@@ -83,15 +83,15 @@ debinstall: components
|
||||||
|
|
||||||
install: build/libitl.so build/libitl.a
|
install: build/libitl.so build/libitl.a
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- hijri/Makefile.orig 2013-09-25 23:36:27.000000000 +0800
|
--- hijri/Makefile.orig 2006-09-21 16:34:31 UTC
|
||||||
+++ hijri/Makefile 2013-09-25 23:36:43.000000000 +0800
|
+++ hijri/Makefile
|
||||||
@@ -10,10 +10,10 @@ demo_hijri:
|
@@ -10,10 +10,10 @@ demo_hijri:
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- prayertime/Makefile.orig 2013-09-25 23:35:59.000000000 +0800
|
--- prayertime/Makefile.orig 2006-09-21 16:37:51 UTC
|
||||||
+++ prayertime/Makefile 2013-09-25 23:36:20.000000000 +0800
|
+++ prayertime/Makefile
|
||||||
@@ -10,10 +10,10 @@ demo_prayer:
|
@@ -10,10 +10,10 @@ demo_prayer:
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- 9e.c.orig Thu Jun 15 13:40:52 2000
|
--- 9e.c.orig 2000-06-15 13:40:52 UTC
|
||||||
+++ 9e.c Fri Jun 23 04:16:00 2000
|
+++ 9e.c
|
||||||
@@ -139,17 +139,16 @@
|
@@ -139,17 +139,16 @@ void do_file(char *file, FILE *fin) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(Hdrs) {
|
if(Hdrs) {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- 7z/Portable.h.org Mon Aug 7 10:54:35 2006
|
--- 7z/Portable.h.orig 2012-12-08 22:16:47 UTC
|
||||||
+++ 7z/Portable.h Mon Aug 7 10:54:55 2006
|
+++ 7z/Portable.h
|
||||||
@@ -2,7 +2,7 @@
|
@@ -2,7 +2,7 @@
|
||||||
#define __PORTABLE_H
|
#define __PORTABLE_H
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
--- Makefile.orig Fri Oct 31 05:32:51 2003
|
--- Makefile.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ Makefile Wed Nov 5 13:53:51 2003
|
+++ Makefile
|
||||||
@@ -38,14 +38,14 @@
|
@@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1
|
||||||
OPT = -O
|
OPT = -O -Wall
|
||||||
# For MWC 3.0 on the Atari ST, use:
|
# For MWC 3.0 on the Atari ST, use:
|
||||||
#CFLAGS = -VCOMPAC -VPEEP
|
#CFLAGS = -VCOMPAC -VPEEP
|
||||||
-CFLAGS = $(OPT) $(SYSTEM)
|
-CFLAGS = $(OPT) $(SYSTEM)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- arc.c.orig Sun Oct 9 03:38:22 2005
|
--- arc.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ arc.c Fri Oct 14 14:22:38 2005
|
+++ arc.c
|
||||||
@@ -290,7 +290,7 @@
|
@@ -298,7 +298,7 @@ main(num, arg) /* system entry point *
|
||||||
keepbak = 1;
|
keepbak = 1;
|
||||||
|
|
||||||
else if (*a == 'W') /* suppress warnings */
|
else if (*a == 'W') /* suppress warnings */
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#if !DOS
|
#if !DOS
|
||||||
else if (*a == 'I') /* image mode, no ASCII/EBCDIC x-late */
|
else if (*a == 'I') /* image mode, no ASCII/EBCDIC x-late */
|
||||||
image = !image;
|
image = !image;
|
||||||
@@ -426,7 +426,7 @@
|
@@ -434,7 +434,7 @@ static VOID
|
||||||
expandlst(n) /* expand an indirect reference */
|
expandlst(n) /* expand an indirect reference */
|
||||||
int n; /* number of entry to expand */
|
int n; /* number of entry to expand */
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arc.h.orig Tue Aug 10 23:03:24 1999
|
--- arc.h.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arc.h Tue Aug 10 23:01:55 1999
|
+++ arc.h
|
||||||
@@ -106,7 +106,7 @@
|
@@ -106,7 +106,7 @@ extern char tmpchr[2]; /* Temporary
|
||||||
#if GEMDOS
|
#if GEMDOS
|
||||||
extern int hold; /* hold screen before exiting */
|
extern int hold; /* hold screen before exiting */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arcadd.c.orig Tue Aug 10 23:03:24 1999
|
--- arcadd.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arcadd.c Tue Aug 10 23:01:55 1999
|
+++ arcadd.c
|
||||||
@@ -119,7 +119,7 @@
|
@@ -119,7 +119,7 @@ int fresh; /* true if fresh
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -9,7 +9,7 @@
|
|||||||
printf("No files match: %s\n", arg[n]);
|
printf("No files match: %s\n", arg[n]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@
|
@@ -133,7 +133,7 @@ int fresh; /* true if fresh
|
||||||
free(path);
|
free(path);
|
||||||
free(name);
|
free(name);
|
||||||
}
|
}
|
||||||
@ -18,7 +18,7 @@
|
|||||||
printf("No files were added.\n");
|
printf("No files were added.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,7 +227,7 @@
|
@@ -227,7 +227,7 @@ addbunch(nfiles, path, name, move, updat
|
||||||
if (move) { /* if this was a move */
|
if (move) { /* if this was a move */
|
||||||
for (n = 0; n < nfiles; n++) { /* then delete each file
|
for (n = 0; n < nfiles; n++) { /* then delete each file
|
||||||
* added */
|
* added */
|
||||||
@ -27,7 +27,7 @@
|
|||||||
printf("Cannot unsave %s\n", path[n]);
|
printf("Cannot unsave %s\n", path[n]);
|
||||||
nerrs++;
|
nerrs++;
|
||||||
}
|
}
|
||||||
@@ -259,7 +259,7 @@
|
@@ -259,7 +259,7 @@ addfile(path, name, update, fresh) /* ad
|
||||||
if (!f)
|
if (!f)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
@ -36,7 +36,7 @@
|
|||||||
printf("Cannot read file: %s\n", path);
|
printf("Cannot read file: %s\n", path);
|
||||||
nerrs++;
|
nerrs++;
|
||||||
}
|
}
|
||||||
@@ -267,7 +267,7 @@
|
@@ -267,7 +267,7 @@ addfile(path, name, update, fresh) /* ad
|
||||||
}
|
}
|
||||||
#if !DOS
|
#if !DOS
|
||||||
if (strlen(name) >= FNLEN) {
|
if (strlen(name) >= FNLEN) {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arccvt.c.orig Tue Aug 10 23:03:24 1999
|
--- arccvt.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arccvt.c Tue Aug 10 23:01:55 1999
|
+++ arccvt.c
|
||||||
@@ -120,7 +120,7 @@
|
@@ -120,7 +120,7 @@ cvtfile(hdr) /* convert a file */
|
||||||
writehdr(hdr, new); /* write out real header */
|
writehdr(hdr, new); /* write out real header */
|
||||||
fseek(new, hdr->size, 1); /* skip over data to next header */
|
fseek(new, hdr->size, 1); /* skip over data to next header */
|
||||||
fclose(tmp); /* all done with the file */
|
fclose(tmp); /* all done with the file */
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arcdata.c.orig Tue Aug 10 23:03:24 1999
|
--- arcdata.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arcdata.c Tue Aug 10 23:01:56 1999
|
+++ arcdata.c
|
||||||
@@ -35,7 +35,7 @@
|
@@ -35,7 +35,7 @@ char tmpchr[2] = "-";/* Tempo
|
||||||
#if GEMDOS
|
#if GEMDOS
|
||||||
int hold = 0; /* true to pause before exit */
|
int hold = 0; /* true to pause before exit */
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,25 +1,23 @@
|
|||||||
*** arcdos.c.old Wed Apr 15 02:58:21 1992
|
--- arcdos.c.orig 2010-08-07 13:06:42 UTC
|
||||||
--- arcdos.c Sat Dec 31 20:32:25 1994
|
+++ arcdos.c
|
||||||
***************
|
@@ -175,14 +175,20 @@ setstamp(f, date, time) /* set a file's
|
||||||
*** 173,186 ****
|
struct tm tm;
|
||||||
--- 173,192 ----
|
struct timeval tvp[2];
|
||||||
struct tm tm;
|
int utimes();
|
||||||
struct timeval tvp[2];
|
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||||
int utimes();
|
long tmclock();
|
||||||
+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
+#endif
|
||||||
long tmclock();
|
tm.tm_sec = (time & 31) * 2;
|
||||||
+ #endif
|
tm.tm_min = (time >> 5) & 63;
|
||||||
tm.tm_sec = (time & 31) * 2;
|
tm.tm_hour = (time >> 11);
|
||||||
tm.tm_min = (time >> 5) & 63;
|
tm.tm_mday = date & 31;
|
||||||
tm.tm_hour = (time >> 11);
|
tm.tm_mon = ((date >> 5) & 15) - 1;
|
||||||
tm.tm_mday = date & 31;
|
tm.tm_year = (date >> 9) + 80;
|
||||||
tm.tm_mon = ((date >> 5) & 15) - 1;
|
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
||||||
tm.tm_year = (date >> 9) + 80;
|
tvp[0].tv_sec = tmclock(&tm);
|
||||||
+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
+#else
|
||||||
tvp[0].tv_sec = tmclock(&tm);
|
+ tvp[0].tv_sec = timelocal(&tm);
|
||||||
+ #else
|
+#endif
|
||||||
+ tvp[0].tv_sec = timelocal(&tm);
|
tvp[1].tv_sec = tvp[0].tv_sec;
|
||||||
+ #endif
|
tvp[0].tv_usec = tvp[1].tv_usec = 0;
|
||||||
tvp[1].tv_sec = tvp[0].tv_sec;
|
utimes(f, tvp);
|
||||||
tvp[0].tv_usec = tvp[1].tv_usec = 0;
|
|
||||||
utimes(f, tvp);
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- arcext.c.orig Sat Oct 8 22:24:37 2005
|
--- arcext.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ arcext.c Fri Oct 14 00:52:14 2005
|
+++ arcext.c
|
||||||
@@ -143,7 +143,7 @@
|
@@ -143,7 +143,7 @@ extfile(hdr, path, prt) /* extract a fi
|
||||||
if (note)
|
if (note)
|
||||||
printf("Extracting file: %s\n", fix);
|
printf("Extracting file: %s\n", fix);
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
if ((f = fopen(fix, "r"))) { /* see if it exists */
|
if ((f = fopen(fix, "r"))) { /* see if it exists */
|
||||||
fclose(f);
|
fclose(f);
|
||||||
printf("WARNING: File %s already exists!", fix);
|
printf("WARNING: File %s already exists!", fix);
|
||||||
@@ -190,7 +190,7 @@
|
@@ -191,7 +191,7 @@ extfile(hdr, path, prt) /* extract a fi
|
||||||
if (!f)
|
if (!f)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- arcio.c.orig Wed Apr 15 02:58:26 1992
|
--- arcio.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ arcio.c Sat Aug 11 22:10:55 2001
|
+++ arcio.c
|
||||||
@@ -46,7 +46,7 @@
|
@@ -46,7 +46,7 @@ readhdr(hdr, f) /* read a header from
|
||||||
return 0; /* then signal end of archive */
|
return 0; /* then signal end of archive */
|
||||||
|
|
||||||
if (hdrver != ARCMARK) { /* check archive validity */
|
if (hdrver != ARCMARK) { /* check archive validity */
|
||||||
@ -9,7 +9,7 @@
|
|||||||
printf("An entry in %s has a bad header.\n", arcname);
|
printf("An entry in %s has a bad header.\n", arcname);
|
||||||
nerrs++;
|
nerrs++;
|
||||||
}
|
}
|
||||||
@@ -63,10 +63,10 @@
|
@@ -67,10 +67,10 @@ readhdr(hdr, f) /* read a header from
|
||||||
if (feof(f) && first)
|
if (feof(f) && first)
|
||||||
arcdie("%s is not an archive", arcname);
|
arcdie("%s is not an archive", arcname);
|
||||||
|
|
||||||
@ -22,7 +22,7 @@
|
|||||||
printf(" %d bytes skipped.\n", try);
|
printf(" %d bytes skipped.\n", try);
|
||||||
|
|
||||||
if (feof(f))
|
if (feof(f))
|
||||||
@@ -110,7 +110,8 @@
|
@@ -118,7 +118,8 @@ readhdr(hdr, f) /* read a header from
|
||||||
hdr->crc = (short) ((dummy[22] << 8) + dummy[21]);
|
hdr->crc = (short) ((dummy[22] << 8) + dummy[21]);
|
||||||
for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++);
|
for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arclzw.c.orig Tue Aug 10 23:03:25 1999
|
--- arclzw.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arclzw.c Tue Aug 10 23:01:57 1999
|
+++ arclzw.c
|
||||||
@@ -546,7 +546,7 @@
|
@@ -560,7 +560,7 @@ decomp(squash, f, t) /* decompress a fi
|
||||||
*/
|
*/
|
||||||
if (code >= free_ent) {
|
if (code >= free_ent) {
|
||||||
if (code > free_ent) {
|
if (code > free_ent) {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- arcrun.c.orig Wed Oct 12 19:22:18 2005
|
--- arcrun.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ arcrun.c Sat May 27 03:47:30 2006
|
+++ arcrun.c
|
||||||
@@ -98,7 +98,7 @@
|
@@ -98,7 +98,7 @@ runfile(hdr, num, arg) /* run a file */
|
||||||
strcpy(sys, buf);
|
strcpy(sys, buf);
|
||||||
|
|
||||||
else {
|
else {
|
||||||
@ -9,7 +9,7 @@
|
|||||||
printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n",
|
printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n",
|
||||||
hdr->name);
|
hdr->name);
|
||||||
nerrs++;
|
nerrs++;
|
||||||
@@ -112,7 +112,7 @@
|
@@ -112,7 +112,7 @@ runfile(hdr, num, arg) /* run a file */
|
||||||
&& strcmp(i, ".TTP")
|
&& strcmp(i, ".TTP")
|
||||||
&& strcmp(i, ".TOS"))
|
&& strcmp(i, ".TOS"))
|
||||||
{
|
{
|
||||||
@ -18,7 +18,7 @@
|
|||||||
printf("File %s is not a .PRG, .TOS, or .TTP\n",
|
printf("File %s is not a .PRG, .TOS, or .TTP\n",
|
||||||
hdr->name);
|
hdr->name);
|
||||||
nerrs++;
|
nerrs++;
|
||||||
@@ -122,7 +122,7 @@
|
@@ -122,7 +122,7 @@ runfile(hdr, num, arg) /* run a file */
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -27,7 +27,7 @@
|
|||||||
if ((tmp = fopen(buf, "r")))
|
if ((tmp = fopen(buf, "r")))
|
||||||
arcdie("Temporary file %s already exists", buf);
|
arcdie("Temporary file %s already exists", buf);
|
||||||
if (!(tmp = tmpopen(buf)))
|
if (!(tmp = tmpopen(buf)))
|
||||||
@@ -146,7 +146,7 @@
|
@@ -146,7 +146,7 @@ runfile(hdr, num, arg) /* run a file */
|
||||||
if (system(buf)) /* try to invoke it */
|
if (system(buf)) /* try to invoke it */
|
||||||
arcdie("Execution failed for %s", buf);
|
arcdie("Execution failed for %s", buf);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./arcunp.c.orig Tue Aug 10 23:03:25 1999
|
--- arcunp.c.orig 2010-08-07 13:06:42 UTC
|
||||||
+++ ./arcunp.c Tue Aug 10 23:01:57 1999
|
+++ arcunp.c
|
||||||
@@ -123,7 +123,7 @@
|
@@ -122,7 +122,7 @@ unpack(f, t, hdr) /* unpack an archive
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: /* unknown method */
|
default: /* unknown method */
|
||||||
@ -9,7 +9,7 @@
|
|||||||
printf("I don't know how to unpack file %s\n", hdr->name);
|
printf("I don't know how to unpack file %s\n", hdr->name);
|
||||||
printf("I think you need a newer version of ARC\n");
|
printf("I think you need a newer version of ARC\n");
|
||||||
nerrs++;
|
nerrs++;
|
||||||
@@ -135,7 +135,7 @@
|
@@ -134,7 +134,7 @@ unpack(f, t, hdr) /* unpack an archive
|
||||||
/* cleanups common to all methods */
|
/* cleanups common to all methods */
|
||||||
|
|
||||||
if (crcval != hdr->crc) {
|
if (crcval != hdr->crc) {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- arj_arcv.c 2005-06-21 22:53:12.000000000 +0300
|
--- arj_arcv.c.orig 2005-06-21 19:53:12 UTC
|
||||||
+++ arj_arcv.c 2005-11-24 02:50:31.000000000 +0200
|
+++ arj_arcv.c
|
||||||
@@ -59,27 +59,27 @@
|
@@ -59,27 +59,27 @@ static char idxid_fault[]="?";
|
||||||
#define setup_hput(ptr) (tmp_hptr=(ptr))
|
#define setup_hput(ptr) (tmp_hptr=(ptr))
|
||||||
|
|
||||||
#define hget_byte() (*(tmp_hptr++)&0xFF)
|
#define hget_byte() (*(tmp_hptr++)&0xFF)
|
||||||
@ -35,7 +35,7 @@
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,18 +87,18 @@
|
@@ -87,18 +87,18 @@ static unsigned long hget_longword()
|
||||||
|
|
||||||
/* Writes two bytes to the header, incrementing the pointer */
|
/* Writes two bytes to the header, incrementing the pointer */
|
||||||
|
|
||||||
@ -58,4 +58,3 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Calculates and stores the basic header size */
|
/* 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
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- arj_proc.c 2005-11-24 02:50:19.000000000 +0200
|
--- arj_proc.c.orig 2005-06-21 19:53:12 UTC
|
||||||
+++ arj_proc.c 2005-11-24 02:50:31.000000000 +0200
|
+++ arj_proc.c
|
||||||
@@ -585,7 +585,7 @@
|
@@ -585,7 +585,7 @@ int search_for_extension(char *name, cha
|
||||||
/* Returns the exact amount of data that could be safely written to the
|
/* Returns the exact amount of data that could be safely written to the
|
||||||
destination volume */
|
destination volume */
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
unsigned long pvol;
|
unsigned long pvol;
|
||||||
unsigned int arjsec_overhead;
|
unsigned int arjsec_overhead;
|
||||||
@@ -605,7 +605,7 @@
|
@@ -605,7 +605,7 @@ unsigned long get_volfree(unsigned int i
|
||||||
remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead-
|
remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead-
|
||||||
(long)out_bytes-(long)cpos-(long)ext_voldata-
|
(long)out_bytes-(long)cpos-(long)ext_voldata-
|
||||||
MULTIVOLUME_RESERVE-t_volume_offset;
|
MULTIVOLUME_RESERVE-t_volume_offset;
|
||||||
@ -18,7 +18,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Performs various checks when multivolume data is packed to predict an
|
/* Performs various checks when multivolume data is packed to predict an
|
||||||
@@ -2466,14 +2466,14 @@
|
@@ -2466,14 +2466,14 @@ static int get_str_from_jq()
|
||||||
*tsptr='\0';
|
*tsptr='\0';
|
||||||
endptr=tsptr;
|
endptr=tsptr;
|
||||||
tsptr=sptr;
|
tsptr=sptr;
|
||||||
@ -36,8 +36,8 @@
|
|||||||
tsptr++;
|
tsptr++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2901,9 +2901,9 @@
|
@@ -2901,9 +2901,9 @@ char *ltrim(char *str)
|
||||||
#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER)
|
#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER)
|
||||||
/* Model-independent routine to get 2 bytes from far RAM */
|
/* Model-independent routine to get 2 bytes from far RAM */
|
||||||
|
|
||||||
-unsigned int mget_word(char FAR *p)
|
-unsigned int mget_word(char FAR *p)
|
||||||
@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
b0=mget_byte(p);
|
b0=mget_byte(p);
|
||||||
b1=mget_byte(p+1);
|
b1=mget_byte(p+1);
|
||||||
@@ -2912,9 +2912,9 @@
|
@@ -2912,9 +2912,9 @@ unsigned int mget_word(char FAR *p)
|
||||||
|
|
||||||
/* Model-independent routine to get 4 bytes from far RAM */
|
/* Model-independent routine to get 4 bytes from far RAM */
|
||||||
|
|
||||||
@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
w0=mget_word(p);
|
w0=mget_word(p);
|
||||||
w1=mget_word(p+2);
|
w1=mget_word(p+2);
|
||||||
@@ -2923,7 +2923,7 @@
|
@@ -2923,7 +2923,7 @@ unsigned long mget_dword(char FAR *p)
|
||||||
|
|
||||||
/* Model-independent routine to store 2 bytes in far RAM */
|
/* Model-independent routine to store 2 bytes in far RAM */
|
||||||
|
|
||||||
@ -69,7 +69,7 @@
|
|||||||
{
|
{
|
||||||
mput_byte(w&0xFF, p);
|
mput_byte(w&0xFF, p);
|
||||||
mput_byte(w>>8 , p+1);
|
mput_byte(w>>8 , p+1);
|
||||||
@@ -2931,7 +2931,7 @@
|
@@ -2931,7 +2931,7 @@ void mput_word(unsigned int w, char FAR
|
||||||
|
|
||||||
/* Model-independent routine to store 4 bytes in far RAM */
|
/* Model-independent routine to store 4 bytes in far RAM */
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- arj_proc.h.orig 2004-01-25 08:39:30.000000000 -0200
|
--- arj_proc.h.orig 2004-01-25 10:39:30 UTC
|
||||||
+++ arj_proc.h 2010-02-19 08:35:05.000000000 -0200
|
+++ arj_proc.h
|
||||||
@@ -8,15 +8,17 @@
|
@@ -8,15 +8,17 @@
|
||||||
#ifndef ARJ_PROC_INCLUDED
|
#ifndef ARJ_PROC_INCLUDED
|
||||||
#define ARJ_PROC_INCLUDED
|
#define ARJ_PROC_INCLUDED
|
||||||
@ -24,7 +24,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Prototypes */
|
/* Prototypes */
|
||||||
@@ -31,7 +33,7 @@
|
@@ -31,7 +33,7 @@ void copy_bytes(unsigned long nbytes);
|
||||||
int translate_path(char *name);
|
int translate_path(char *name);
|
||||||
void restart_proc(char *dest);
|
void restart_proc(char *dest);
|
||||||
int search_for_extension(char *name, char *ext_list);
|
int search_for_extension(char *name, char *ext_list);
|
||||||
@ -33,7 +33,7 @@
|
|||||||
unsigned int check_multivolume(unsigned int increment);
|
unsigned int check_multivolume(unsigned int increment);
|
||||||
void store();
|
void store();
|
||||||
void hollow_encode();
|
void hollow_encode();
|
||||||
@@ -61,10 +63,10 @@
|
@@ -61,10 +63,10 @@ void unpack_mem(struct mempack *mempack)
|
||||||
void strip_lf(char *str);
|
void strip_lf(char *str);
|
||||||
char *ltrim(char *str);
|
char *ltrim(char *str);
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- environ.c.orig 2010-10-28 13:11:54.000000000 -0200
|
--- environ.c.orig 2004-06-18 16:19:36 UTC
|
||||||
+++ environ.c 2010-10-28 13:13:10.000000000 -0200
|
+++ environ.c
|
||||||
@@ -2058,7 +2058,7 @@
|
@@ -2058,7 +2058,7 @@ FILE *file_open(char *name, char *mode)
|
||||||
/* ASR fix 01/10/2003 -- re-fix to handle umask 022 correctly */
|
/* ASR fix 01/10/2003 -- re-fix to handle umask 022 correctly */
|
||||||
if((handle=open(name, oflag, 0644))==-1)
|
if((handle=open(name, oflag, 0644))==-1)
|
||||||
return(NULL);
|
return(NULL);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- fardata.c.orig 2010-01-18 10:06:57.000000000 -0200
|
--- fardata.c.orig 2004-04-17 11:39:42 UTC
|
||||||
+++ fardata.c 2010-01-18 10:08:24.000000000 -0200
|
+++ fardata.c
|
||||||
@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
|
@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
|
||||||
|
|
||||||
/* Length-limited strlen() */
|
/* Length-limited strlen() */
|
||||||
|
|||||||
@ -31,7 +31,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200
|
|||||||
Conflicts:
|
Conflicts:
|
||||||
part/part.cpp
|
part/part.cpp
|
||||||
|
|
||||||
--- app/mainwindow.cpp
|
--- app/mainwindow.cpp.orig 2014-10-25 12:53:24 UTC
|
||||||
+++ app/mainwindow.cpp
|
+++ app/mainwindow.cpp
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
@ -50,7 +50,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200
|
|||||||
delete m_part;
|
delete m_part;
|
||||||
m_part = 0;
|
m_part = 0;
|
||||||
}
|
}
|
||||||
--- part/part.cpp
|
--- part/part.cpp.orig 2014-10-25 12:53:24 UTC
|
||||||
+++ part/part.cpp
|
+++ part/part.cpp
|
||||||
@@ -53,7 +53,6 @@
|
@@ -53,7 +53,6 @@
|
||||||
#include <KStandardGuiItem>
|
#include <KStandardGuiItem>
|
||||||
@ -60,7 +60,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200
|
|||||||
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QCursor>
|
#include <QCursor>
|
||||||
@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args)
|
@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObjec
|
||||||
|
|
||||||
Part::~Part()
|
Part::~Part()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- configure.orig 2012-02-21 18:14:06 UTC
|
--- configure.orig 2012-02-21 18:14:06 UTC
|
||||||
+++ configure
|
+++ configure
|
||||||
@@ -2261,7 +2261,7 @@
|
@@ -2261,7 +2261,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
eval `$PERL -V:startperl`
|
eval `$PERL -V:startperl`
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.orig Sat Aug 31 09:50:33 1996
|
--- Makefile.orig 1996-08-31 07:50:33 UTC
|
||||||
+++ Makefile Fri Sep 27 13:57:55 1996
|
+++ Makefile
|
||||||
@@ -1,29 +1,17 @@
|
@@ -1,29 +1,17 @@
|
||||||
-
|
-
|
||||||
-CC = gcc
|
-CC = gcc
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
--- bzip.c.orig 1996-08-30 20:35:28.000000000 +0000
|
--- bzip.c.orig 1996-08-30 20:35:28 UTC
|
||||||
+++ bzip.c
|
+++ bzip.c
|
||||||
@@ -114,9 +114,13 @@
|
@@ -114,9 +114,13 @@
|
||||||
--*/
|
--*/
|
||||||
|
|||||||
@ -13,7 +13,6 @@ COMMENT= Block-sorting file compressor
|
|||||||
USES= cpe
|
USES= cpe
|
||||||
CPE_VENDOR= bzip
|
CPE_VENDOR= bzip
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
PATCH_STRIP= -p3
|
|
||||||
|
|
||||||
OPTIONS_DEFINE= DOCS
|
OPTIONS_DEFINE= DOCS
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.orig Tue Jan 2 22:49:21 2007
|
--- Makefile.orig 2010-09-10 22:46:02 UTC
|
||||||
+++ Makefile Sat Jan 27 12:02:14 2007
|
+++ Makefile
|
||||||
@@ -15,13 +15,15 @@
|
@@ -15,13 +15,15 @@
|
||||||
SHELL=/bin/sh
|
SHELL=/bin/sh
|
||||||
|
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
# Where you want it installed when you do 'make install'
|
# Where you want it installed when you do 'make install'
|
||||||
PREFIX=/usr/local
|
PREFIX=/usr/local
|
||||||
@@ -35,10 +37,18 @@
|
@@ -35,10 +37,18 @@ OBJS= blocksort.o \
|
||||||
decompress.o \
|
decompress.o \
|
||||||
bzlib.o
|
bzlib.o
|
||||||
|
|
||||||
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
bzip2recover: bzip2recover.o
|
bzip2recover: bzip2recover.o
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
|
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
|
||||||
@@ -52,6 +62,10 @@
|
@@ -52,6 +62,10 @@ libbz2.a: $(OBJS)
|
||||||
$(RANLIB) libbz2.a ; \
|
$(RANLIB) libbz2.a ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -51,7 +51,7 @@
|
|||||||
check: test
|
check: test
|
||||||
test: bzip2
|
test: bzip2
|
||||||
@cat words1
|
@cat words1
|
||||||
@@ -109,9 +123,25 @@
|
@@ -109,10 +123,26 @@ install: bzip2 bzip2recover
|
||||||
echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
|
echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@ -59,7 +59,7 @@
|
|||||||
+ rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
|
+ rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
|
||||||
sample1.rb2 sample2.rb2 sample3.rb2 \
|
sample1.rb2 sample2.rb2 sample3.rb2 \
|
||||||
sample1.tst sample2.tst sample3.tst
|
sample1.tst sample2.tst sample3.tst
|
||||||
+
|
|
||||||
+blocksort.so: blocksort.c
|
+blocksort.so: blocksort.c
|
||||||
+ @cat words0
|
+ @cat words0
|
||||||
+ $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so
|
+ $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so
|
||||||
@ -75,6 +75,7 @@
|
|||||||
+ $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so
|
+ $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so
|
||||||
+bzlib.so: bzlib.c
|
+bzlib.so: bzlib.c
|
||||||
+ $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so
|
+ $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so
|
||||||
|
+
|
||||||
blocksort.o: blocksort.c
|
blocksort.o: blocksort.c
|
||||||
@cat words0
|
@cat words0
|
||||||
|
$(CC) $(CFLAGS) -c blocksort.c
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- Makefile.in.orig 2006-03-25 16:15:04.000000000 +0300
|
--- Makefile.in.orig 2006-03-25 13:15:04 UTC
|
||||||
+++ Makefile.in 2015-02-25 22:26:51.000000000 +0300
|
+++ Makefile.in
|
||||||
@@ -24,8 +24,8 @@
|
@@ -24,8 +24,8 @@ INSTALL = @INSTALL@
|
||||||
|
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
@ -11,7 +11,7 @@
|
|||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
@@ -41,13 +41,14 @@
|
@@ -41,13 +41,14 @@ OBJS += dact_common.o comp_fail.o comp_p
|
||||||
# be kept in sync with OBJS
|
# be kept in sync with OBJS
|
||||||
SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@
|
SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@
|
||||||
ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
|
ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- src/deutex.h.orig 1999-12-31 07:20:22.000000000 +0800
|
--- src/deutex.h.orig 1999-12-30 23:20:22 UTC
|
||||||
+++ src/deutex.h 2012-02-12 16:53:51.000000000 +0800
|
+++ src/deutex.h
|
||||||
@@ -31,23 +31,13 @@
|
@@ -31,23 +31,13 @@ Place, Suite 330, Boston, MA 02111-1307,
|
||||||
#define DeuSF for DOS .EXE Unix Linux OS/2
|
#define DeuSF for DOS .EXE Unix Linux OS/2
|
||||||
*********************************************/
|
*********************************************/
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
--- lib/compat/gettext.h.orig 2015-05-03 14:52:33 UTC
|
--- lib/compat/gettext.h.orig 2015-11-25 21:45:14 UTC
|
||||||
+++ lib/compat/gettext.h
|
+++ lib/compat/gettext.h
|
||||||
@@ -53,7 +53,6 @@
|
@@ -53,7 +53,6 @@
|
||||||
<libintl.h>, which chokes if dcgettext is defined as a macro. So include
|
<libintl.h>, which chokes if dcgettext is defined as a macro. So include
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
--- scripts/Dpkg/Compression.pm.orig 2015-06-11 20:28:56 UTC
|
--- scripts/Dpkg/Compression.pm.orig 2016-07-03 19:02:23 UTC
|
||||||
+++ scripts/Dpkg/Compression.pm
|
+++ scripts/Dpkg/Compression.pm
|
||||||
@@ -55,7 +55,7 @@ interact with the set of supported compr
|
@@ -55,7 +55,7 @@ interact with the set of supported compr
|
||||||
my $COMP = {
|
my $COMP = {
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
--- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400
|
--- src/fr-command-lrzip.c.orig 2015-10-14 17:33:41 UTC
|
||||||
+++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400
|
+++ src/fr-command-lrzip.c
|
||||||
@@ -53,7 +53,7 @@ list__process_line (char *line,
|
@@ -53,7 +53,7 @@ list__process_line (char *line,
|
||||||
struct stat st;
|
struct stat st;
|
||||||
time_t tt;
|
|
||||||
if (stat (comm->filename, &st) == 0)
|
if (stat (comm->filename, &st) == 0)
|
||||||
- fdata->modified = st.st_mtim.tv_sec;
|
- fdata->modified = st.st_mtim.tv_sec;
|
||||||
+ fdata->modified = st.st_mtime;
|
+ fdata->modified = st.st_mtime;
|
||||||
else
|
else
|
||||||
time(&(fdata->modified));
|
time(&(fdata->modified));
|
||||||
fdata->modified;
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- src/fr-command-tar.c.orig 2014-11-19 15:44:09.000000000 +0100
|
--- src/fr-command-tar.c.orig 2015-10-14 17:33:41 UTC
|
||||||
+++ src/fr-command-tar.c 2014-12-04 18:28:31.998497849 +0100
|
+++ src/fr-command-tar.c
|
||||||
@@ -245,6 +245,10 @@
|
@@ -245,6 +245,10 @@ begin_tar_command (FrCommand *comm)
|
||||||
g_free (command);
|
g_free (command);
|
||||||
command = g_strdup ("/usr/sfw/bin/gtar");
|
command = g_strdup ("/usr/sfw/bin/gtar");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- src/fr-command-zip.c.orig 2010-01-02 17:02:44.000000000 -0500
|
--- src/fr-command-zip.c.orig 2015-10-14 17:33:41 UTC
|
||||||
+++ src/fr-command-zip.c 2010-01-02 17:08:03.000000000 -0500
|
+++ src/fr-command-zip.c
|
||||||
@@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm)
|
@@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm)
|
||||||
{
|
{
|
||||||
fr_process_set_out_line_func (comm->process, list__process_line, comm);
|
fr_process_set_out_line_func (comm->process, list__process_line, comm);
|
||||||
@ -11,8 +11,8 @@
|
|||||||
+#endif
|
+#endif
|
||||||
fr_process_set_begin_func (comm->process, list__begin, comm);
|
fr_process_set_begin_func (comm->process, list__begin, comm);
|
||||||
fr_process_add_arg (comm->process, "-ZTs");
|
fr_process_add_arg (comm->process, "-ZTs");
|
||||||
fr_process_add_arg (comm->process, comm->filename);
|
fr_process_add_arg (comm->process, "--");
|
||||||
@@ -302,7 +306,11 @@ fr_command_zip_extract (FrCommand *comm
|
@@ -307,7 +311,11 @@ fr_command_zip_extract (FrCommand *comm
|
||||||
process_line__common,
|
process_line__common,
|
||||||
comm);
|
comm);
|
||||||
|
|
||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
if (dest_dir != NULL) {
|
if (dest_dir != NULL) {
|
||||||
fr_process_add_arg (comm->process, "-d");
|
fr_process_add_arg (comm->process, "-d");
|
||||||
@@ -334,7 +342,11 @@ fr_command_zip_extract (FrCommand *comm
|
@@ -341,7 +349,11 @@ fr_command_zip_extract (FrCommand *comm
|
||||||
static void
|
static void
|
||||||
fr_command_zip_test (FrCommand *comm)
|
fr_command_zip_test (FrCommand *comm)
|
||||||
{
|
{
|
||||||
@ -36,4 +36,4 @@
|
|||||||
+#endif
|
+#endif
|
||||||
fr_process_add_arg (comm->process, "-t");
|
fr_process_add_arg (comm->process, "-t");
|
||||||
add_password_arg (comm, comm->password);
|
add_password_arg (comm, comm->password);
|
||||||
fr_process_add_arg (comm->process, comm->filename);
|
fr_process_add_arg (comm->process, "--");
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006
|
--- src/fr-command-tar.c.orig 2014-08-13 05:21:20 UTC
|
||||||
+++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006
|
+++ src/fr-command-tar.c
|
||||||
@@ -231,6 +231,9 @@
|
@@ -236,6 +236,9 @@ begin_tar_command (FrCommand *comm)
|
||||||
#if defined (__SVR4) && defined (__sun)
|
#if defined (__SVR4) && defined (__sun)
|
||||||
if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
|
if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
|
||||||
command = g_strdup ("/usr/sfw/bin/gtar");
|
command = g_strdup ("/usr/sfw/bin/gtar");
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- src/fr-command-zip.c.orig 2010-11-16 08:32:18.000000000 +0000
|
--- src/fr-command-zip.c.orig 2015-02-15 10:13:10 UTC
|
||||||
+++ src/fr-command-zip.c 2011-01-20 16:55:45.000000000 +0000
|
+++ src/fr-command-zip.c
|
||||||
@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand *comm)
|
@@ -179,7 +179,11 @@ fr_command_zip_list (FrCommand *comm)
|
||||||
{
|
{
|
||||||
fr_process_set_out_line_func (comm->process, list__process_line, comm);
|
fr_process_set_out_line_func (comm->process, list__process_line, comm);
|
||||||
|
|
||||||
@ -11,8 +11,8 @@
|
|||||||
+#endif
|
+#endif
|
||||||
fr_process_set_begin_func (comm->process, list__begin, comm);
|
fr_process_set_begin_func (comm->process, list__begin, comm);
|
||||||
fr_process_add_arg (comm->process, "-ZTs");
|
fr_process_add_arg (comm->process, "-ZTs");
|
||||||
fr_process_add_arg (comm->process, comm->filename);
|
fr_process_add_arg (comm->process, "--");
|
||||||
@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand *comm
|
@@ -299,7 +303,11 @@ fr_command_zip_extract (FrCommand *comm
|
||||||
process_line__common,
|
process_line__common,
|
||||||
comm);
|
comm);
|
||||||
|
|
||||||
@ -34,5 +34,5 @@
|
|||||||
fr_process_begin_command (comm->process, "unzip");
|
fr_process_begin_command (comm->process, "unzip");
|
||||||
+#endif
|
+#endif
|
||||||
fr_process_add_arg (comm->process, "-t");
|
fr_process_add_arg (comm->process, "-t");
|
||||||
add_password_arg (comm, comm->password);
|
add_password_arg (comm, FR_ARCHIVE (comm)->password);
|
||||||
fr_process_add_arg (comm->process, comm->filename);
|
fr_process_add_arg (comm->process, "--");
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./Makefile.in.orig 1993-02-24 14:36:56.000000000 +0100
|
--- Makefile.in.orig 1993-02-24 13:36:56 UTC
|
||||||
+++ ./Makefile.in 2014-02-13 12:44:47.785972991 +0100
|
+++ Makefile.in
|
||||||
@@ -18,9 +18,9 @@
|
@@ -18,9 +18,9 @@ EXE =
|
||||||
default: prog
|
default: prog
|
||||||
|
|
||||||
# Added the prefix macro, so that it was easier to change installation place.
|
# Added the prefix macro, so that it was easier to change installation place.
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ./freeze.c.orig 1993-02-24 14:36:55.000000000 +0100
|
--- freeze.c.orig 1993-02-24 13:36:55 UTC
|
||||||
+++ ./freeze.c 2014-02-13 12:43:34.946976981 +0100
|
+++ freeze.c
|
||||||
@@ -176,7 +176,7 @@
|
@@ -176,7 +176,7 @@ void writeerr(), copystat(), version(
|
||||||
|
|
||||||
/* From compress.c. Replace .Z --> .F etc */
|
/* From compress.c. Replace .Z --> .F etc */
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- ./freeze.h.orig 1993-02-24 14:36:58.000000000 +0100
|
--- freeze.h.orig 1993-02-24 13:36:58 UTC
|
||||||
+++ ./freeze.h 2014-02-13 12:43:34.947977110 +0100
|
+++ freeze.h
|
||||||
@@ -5,21 +5,6 @@
|
@@ -5,21 +5,6 @@
|
||||||
# include <sys/stdtypes.h>
|
# include <sys/stdtypes.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,19 +1,11 @@
|
|||||||
*** nix/machine.c.bak Thu Jan 12 09:53:00 1995
|
--- nix/machine.c.orig 1995-01-12 06:53:00 UTC
|
||||||
--- nix/machine.c Tue Jan 24 19:38:07 1995
|
+++ nix/machine.c
|
||||||
***************
|
@@ -417,7 +417,7 @@ char *md_stripname(char *mdfullpath) {
|
||||||
*** 417,423 ****
|
if (plainname!=NULL) free(plainname),plainname=NULL;
|
||||||
if (plainname!=NULL) free(plainname),plainname=NULL;
|
if ((plainname=malloc(strlen(mdfullpath)+1))==NULL)
|
||||||
if ((plainname=malloc(strlen(mdfullpath)+1))==NULL)
|
error(1,ERR_MEM,"md_stripname()");
|
||||||
error(1,ERR_MEM,"md_stripname()");
|
- for (i=strlen(mdfullpath)-1;i>0;i--) {
|
||||||
! for (i=strlen(mdfullpath)-1;i>0;i--) {
|
+ for (i=strlen(mdfullpath)-1;i>=0;i--) {
|
||||||
if (mdfullpath[i]=='/') {
|
if (mdfullpath[i]=='/') {
|
||||||
i++;
|
i++;
|
||||||
break;
|
break;
|
||||||
--- 417,423 ----
|
|
||||||
if (plainname!=NULL) free(plainname),plainname=NULL;
|
|
||||||
if ((plainname=malloc(strlen(mdfullpath)+1))==NULL)
|
|
||||||
error(1,ERR_MEM,"md_stripname()");
|
|
||||||
! for (i=strlen(mdfullpath)-1;i>=0;i--) {
|
|
||||||
if (mdfullpath[i]=='/') {
|
|
||||||
i++;
|
|
||||||
break;
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.orig Wed Jun 11 07:59:00 2003
|
--- Makefile.orig 2003-06-05 14:38:33 UTC
|
||||||
+++ Makefile Wed Jun 11 08:00:47 2003
|
+++ Makefile
|
||||||
@@ -1,16 +1,19 @@
|
@@ -1,16 +1,19 @@
|
||||||
-opzioni=-O3
|
-opzioni=-O3
|
||||||
+CFLAGS ?= ${CFLAGS}
|
+CFLAGS ?= ${CFLAGS}
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
--- HLExtract/Main.c.orig 2016-07-26 11:59:22 UTC
|
||||||
--- ../orig/HLExtract/Main.c 2011-09-17 00:41:54.000000000 -0300
|
+++ HLExtract/Main.c
|
||||||
+++ ./HLExtract/Main.c 2013-02-11 18:29:02.880217165 -0200
|
|
||||||
@@ -52,7 +52,7 @@
|
@@ -52,7 +52,7 @@
|
||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
@ -10,7 +9,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
# define MAX_PATH PATH_MAX
|
# define MAX_PATH PATH_MAX
|
||||||
|
|
||||||
# define FOREGROUND_BLUE 0x0001
|
# define FOREGROUND_BLUE 0x0001
|
||||||
@@ -618,15 +618,15 @@
|
@@ -618,15 +618,15 @@ hlVoid PrintUsage()
|
||||||
printf("\n");
|
printf("\n");
|
||||||
printf("Example HLExtract usage:\n");
|
printf("Example HLExtract usage:\n");
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@ -34,7 +33,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -657,6 +657,8 @@
|
@@ -657,6 +657,8 @@ hlVoid List(FILE *pFile, HLDirectoryItem
|
||||||
fprintf(pFile, "%s\n", lpPath);
|
fprintf(pFile, "%s\n", lpPath);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -43,7 +42,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -843,6 +845,8 @@
|
@@ -843,6 +845,8 @@ HLValidation Validate(HLDirectoryItem *p
|
||||||
PrintValidation(eValidation);
|
PrintValidation(eValidation);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
break;
|
break;
|
||||||
@ -52,7 +51,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -851,6 +855,8 @@
|
@@ -851,6 +855,8 @@ HLValidation Validate(HLDirectoryItem *p
|
||||||
printf(" \n");
|
printf(" \n");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -61,7 +60,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
return eValidation;
|
return eValidation;
|
||||||
@@ -882,6 +888,8 @@
|
@@ -882,6 +888,8 @@ hlVoid PrintAttribute(hlChar *lpPrefix,
|
||||||
case HL_ATTRIBUTE_STRING:
|
case HL_ATTRIBUTE_STRING:
|
||||||
printf("%s%s: %s%s\n", lpPrefix, pAttribute->lpName, pAttribute->Value.String.lpValue, lpPostfix);
|
printf("%s%s: %s%s\n", lpPrefix, pAttribute->lpName, pAttribute->Value.String.lpValue, lpPostfix);
|
||||||
break;
|
break;
|
||||||
@ -70,7 +69,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1151,6 +1159,8 @@
|
@@ -1151,6 +1159,8 @@ hlVoid EnterConsole(hlUInt uiPackage, hl
|
||||||
printf(" Size: %u B\n", hlFileGetSize(pSubItem));
|
printf(" Size: %u B\n", hlFileGetSize(pSubItem));
|
||||||
printf(" Size On Disk: %u B\n", hlFileGetSizeOnDisk(pSubItem));
|
printf(" Size On Disk: %u B\n", hlFileGetSizeOnDisk(pSubItem));
|
||||||
break;
|
break;
|
||||||
@ -79,4 +78,3 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
uiItemCount = hlPackageGetItemAttributeCount();
|
uiItemCount = hlPackageGetItemAttributeCount();
|
||||||
Only in ./HLExtract: Main.c.bak
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- archive.c.orig Tue Jun 29 05:27:52 1993
|
--- archive.c.orig 1993-06-29 10:27:52 UTC
|
||||||
+++ archive.c Tue Dec 28 20:01:38 1999
|
+++ archive.c
|
||||||
@@ -326,12 +326,22 @@
|
@@ -326,12 +326,22 @@ BOOLEAN confirmSkip( const char *str1, c
|
||||||
|
|
||||||
void getFileName( char *fileName )
|
void getFileName( char *fileName )
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- cli.c.orig Sat Sep 4 22:23:48 1993
|
--- cli.c.orig 1993-09-05 03:23:48 UTC
|
||||||
+++ cli.c Tue Dec 28 20:01:38 1999
|
+++ cli.c
|
||||||
@@ -724,12 +724,18 @@
|
@@ -724,12 +724,18 @@ static BOOLEAN checkStealthMode( char *a
|
||||||
|
|
||||||
void doConfigFile( void )
|
void doConfigFile( void )
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- crypt/keymgmt.c.orig Tue Aug 17 16:56:14 1993
|
--- crypt/keymgmt.c.orig 1993-08-17 21:56:14 UTC
|
||||||
+++ crypt/keymgmt.c Tue Dec 28 20:01:38 1999
|
+++ crypt/keymgmt.c
|
||||||
@@ -495,11 +495,24 @@
|
@@ -495,11 +495,24 @@ BOOLEAN getKey( const BOOLEAN isPemKey,
|
||||||
FD keyFileFD, savedInFD = getInputFD();
|
FD keyFileFD, savedInFD = getInputFD();
|
||||||
BOOLEAN matched, firstTime = TRUE;
|
BOOLEAN matched, firstTime = TRUE;
|
||||||
char *matchID, firstChar;
|
char *matchID, firstChar;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- defs.h.orig Mon May 31 10:17:00 1993
|
--- defs.h.orig 1993-05-31 15:17:00 UTC
|
||||||
+++ defs.h Tue Dec 28 20:01:38 1999
|
+++ defs.h
|
||||||
@@ -43,7 +43,7 @@
|
@@ -43,7 +43,7 @@ typedef int BOOLEAN;
|
||||||
|
|
||||||
/* 'inline' patch for compilers which can't handle this */
|
/* 'inline' patch for compilers which can't handle this */
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- hpacklib.h.orig Thu Aug 5 04:10:40 1993
|
--- hpacklib.h.orig 1993-08-05 09:10:40 UTC
|
||||||
+++ hpacklib.h Tue Dec 28 20:01:38 1999
|
+++ hpacklib.h
|
||||||
@@ -26,12 +26,12 @@
|
@@ -26,12 +26,12 @@
|
||||||
|
|
||||||
#include <stdio.h> /* Prototypes for generic functions */
|
#include <stdio.h> /* Prototypes for generic functions */
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- keycvt/keycvt.c.orig Fri Aug 13 15:06:28 1993
|
--- keycvt/keycvt.c.orig 1993-08-13 20:06:28 UTC
|
||||||
+++ keycvt/keycvt.c Tue Dec 28 20:01:38 1999
|
+++ keycvt/keycvt.c
|
||||||
@@ -582,11 +582,21 @@
|
@@ -582,11 +582,21 @@ static void byteReverse( BYTE *regPtr, i
|
||||||
|
|
||||||
static void getPassword( void )
|
static void getPassword( void )
|
||||||
{
|
{
|
||||||
@ -22,7 +22,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
void initCrypt( void )
|
void initCrypt( void )
|
||||||
@@ -1020,27 +1030,46 @@
|
@@ -1020,27 +1030,46 @@ int main( const int argc, const char *ar
|
||||||
|
|
||||||
/* Try and find the PGP seed file */
|
/* Try and find the PGP seed file */
|
||||||
if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL )
|
if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL )
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- keycvt/makefile.orig Tue May 18 00:43:30 1993
|
--- keycvt/makefile.orig 1993-05-17 21:43:30 UTC
|
||||||
+++ keycvt/makefile Sun Jul 21 17:32:13 2002
|
+++ keycvt/makefile
|
||||||
@@ -48,7 +48,7 @@
|
@@ -48,7 +48,7 @@ DEFINES = $(OS)
|
||||||
|
|
||||||
PROJ = keycvt
|
PROJ = keycvt
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
LFLAGS = -o $(PROJ) $(CMDL) # Flags for linker
|
LFLAGS = -o $(PROJ) $(CMDL) # Flags for linker
|
||||||
|
|
||||||
@@ -60,6 +60,7 @@
|
@@ -60,6 +60,7 @@ LD = $(CC) # Linker (just use the C
|
||||||
LS = ls -l # Directory command
|
LS = ls -l # Directory command
|
||||||
ECHO = echo # Echo to screen command
|
ECHO = echo # Echo to screen command
|
||||||
MAKE = make # The make command
|
MAKE = make # The make command
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
#* *
|
#* *
|
||||||
@@ -71,7 +72,7 @@
|
@@ -71,7 +72,7 @@ default:
|
||||||
@$(ECHO)
|
@$(ECHO)
|
||||||
@$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build"
|
@$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build"
|
||||||
@$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex,"
|
@$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex,"
|
||||||
@ -26,16 +26,16 @@
|
|||||||
@$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try"
|
@$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try"
|
||||||
@$(ECHO) "'make generic', and send a copy of any changes necessary to the author,"
|
@$(ECHO) "'make generic', and send a copy of any changes necessary to the author,"
|
||||||
@$(ECHO) "pgut1@cs.aukuni.ac.nz"
|
@$(ECHO) "pgut1@cs.aukuni.ac.nz"
|
||||||
@@ -128,6 +129,12 @@
|
@@ -129,6 +130,12 @@ aix386:
|
||||||
|
|
||||||
convex:
|
convex:
|
||||||
@$(MAKE) keycvt CC="cc"
|
@$(MAKE) keycvt CC="cc"
|
||||||
+
|
|
||||||
+freebsd:
|
+freebsd:
|
||||||
+ @$(MAKE) $(PROJ)
|
+ @$(MAKE) $(PROJ)
|
||||||
+
|
+
|
||||||
+freebsd.install:
|
+freebsd.install:
|
||||||
+ $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin
|
+ $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin
|
||||||
|
+
|
||||||
# Generic: Generic BSD-ish system running gcc. Can't continue, we really
|
# Generic: Generic BSD-ish system running gcc. Can't continue, we really
|
||||||
# need user intervention here.
|
# need user intervention here.
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- language/language.c.orig Wed Sep 22 21:23:20 1993
|
--- language/language.c.orig 1993-09-23 02:23:20 UTC
|
||||||
+++ language/language.c Tue Dec 28 20:01:38 1999
|
+++ language/language.c
|
||||||
@@ -188,7 +188,7 @@
|
@@ -188,7 +188,7 @@ void showHelp( void )
|
||||||
/* Process user response */
|
/* Process user response */
|
||||||
response = hgetch();
|
response = hgetch();
|
||||||
response = toupper( response ); /* Damn macros */
|
response = toupper( response ); /* Damn macros */
|
||||||
@ -9,7 +9,7 @@
|
|||||||
if( response == RESPONSE_QUIT )
|
if( response == RESPONSE_QUIT )
|
||||||
return;
|
return;
|
||||||
lineNo -= ( response == ' ' ) ? screenHeight : 1;
|
lineNo -= ( response == ' ' ) ? screenHeight : 1;
|
||||||
@@ -268,6 +268,9 @@
|
@@ -268,6 +268,9 @@ int initMessages( const char *path, cons
|
||||||
if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR )
|
if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR )
|
||||||
return( ERROR );
|
return( ERROR );
|
||||||
#elif defined( __UNIX__ )
|
#elif defined( __UNIX__ )
|
||||||
@ -19,7 +19,7 @@
|
|||||||
/* Build path to language file and try and process it */
|
/* Build path to language file and try and process it */
|
||||||
fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME );
|
fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME );
|
||||||
while( fileNamePtr != NULL )
|
while( fileNamePtr != NULL )
|
||||||
@@ -290,6 +293,9 @@
|
@@ -290,6 +293,9 @@ int initMessages( const char *path, cons
|
||||||
return( ERROR ); /* Couldn't find/open input file */
|
return( ERROR ); /* Couldn't find/open input file */
|
||||||
}
|
}
|
||||||
#endif /* System-specific handling of how to find language defn.file */
|
#endif /* System-specific handling of how to find language defn.file */
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- system.h.orig Fri Aug 27 12:16:40 1993
|
--- system.h.orig 1993-08-27 17:16:40 UTC
|
||||||
+++ system.h Tue Dec 28 20:01:38 1999
|
+++ system.h
|
||||||
@@ -788,7 +788,10 @@
|
@@ -788,7 +788,10 @@ void strlwr( char *string );
|
||||||
#elif defined( CONVEX )
|
#elif defined( CONVEX )
|
||||||
#define MAX_PATH ( _POSIX_PATH_MAX + 1 )
|
#define MAX_PATH ( _POSIX_PATH_MAX + 1 )
|
||||||
#define MAX_FILENAME ( 254 + 1 )
|
#define MAX_FILENAME ( 254 + 1 )
|
||||||
@ -12,7 +12,7 @@
|
|||||||
#define MAX_PATH ( _POSIX_PATH_MAX + 1 )
|
#define MAX_PATH ( _POSIX_PATH_MAX + 1 )
|
||||||
#define MAX_FILENAME ( NAME_MAX + 1 )
|
#define MAX_FILENAME ( NAME_MAX + 1 )
|
||||||
#elif defined( SVR4 )
|
#elif defined( SVR4 )
|
||||||
@@ -875,7 +878,8 @@
|
@@ -875,7 +878,8 @@ typedef struct {
|
||||||
#if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \
|
#if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \
|
||||||
defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \
|
defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \
|
||||||
defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \
|
defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \
|
||||||
@ -22,7 +22,7 @@
|
|||||||
#define SPACE_OK TRUE
|
#define SPACE_OK TRUE
|
||||||
#else
|
#else
|
||||||
#define SPACE_OK FALSE
|
#define SPACE_OK FALSE
|
||||||
@@ -948,6 +952,13 @@
|
@@ -948,6 +952,13 @@ typedef struct {
|
||||||
#elif defined( UTS4 ) /* Amdahl UTS4 */
|
#elif defined( UTS4 ) /* Amdahl UTS4 */
|
||||||
#define NEED_STRLWR
|
#define NEED_STRLWR
|
||||||
#define NEED_STRICMP
|
#define NEED_STRICMP
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- system/unix.c.orig Fri Aug 27 12:20:56 1993
|
--- system/unix.c.orig 1993-08-27 17:20:56 UTC
|
||||||
+++ system/unix.c Tue Dec 28 20:01:38 1999
|
+++ system/unix.c
|
||||||
@@ -123,7 +123,7 @@
|
@@ -123,7 +123,7 @@ static int randomBufferPos = 0;
|
||||||
|
|
||||||
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
||||||
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
|
|
||||||
@@ -144,7 +144,7 @@
|
@@ -144,7 +144,7 @@ int hgetch( void )
|
||||||
tcgetattr( ttyFD, &ttyInfo );
|
tcgetattr( ttyFD, &ttyInfo );
|
||||||
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
||||||
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
||||||
@ -18,7 +18,7 @@
|
|||||||
ttyInfo.c_lflag &= ~ECHO;
|
ttyInfo.c_lflag &= ~ECHO;
|
||||||
ttyInfo.c_lflag &= ~ICANON;
|
ttyInfo.c_lflag &= ~ICANON;
|
||||||
#else
|
#else
|
||||||
@@ -183,7 +183,7 @@
|
@@ -183,7 +183,7 @@ int hgetch( void )
|
||||||
tcgetattr( ttyFD, &ttyInfo );
|
tcgetattr( ttyFD, &ttyInfo );
|
||||||
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
#if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \
|
||||||
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \
|
||||||
@ -27,7 +27,7 @@
|
|||||||
ttyInfo.c_lflag |= ECHO;
|
ttyInfo.c_lflag |= ECHO;
|
||||||
ttyInfo.c_lflag |= ICANON;
|
ttyInfo.c_lflag |= ICANON;
|
||||||
#else
|
#else
|
||||||
@@ -728,7 +728,7 @@
|
@@ -728,7 +728,7 @@ int getCountry( void )
|
||||||
defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \
|
defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \
|
||||||
defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \
|
defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \
|
||||||
defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \
|
defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
--- Makefile.orig 2009-01-25 18:27:52.000000000 +0100
|
--- Makefile.orig 2009-04-03 22:33:49 UTC
|
||||||
+++ Makefile 2009-02-07 18:56:15.000000000 +0100
|
+++ Makefile
|
||||||
@@ -1,15 +1,10 @@
|
@@ -1,15 +1,10 @@
|
||||||
# Makefile,v 1.8 2009-01-25 17:27:52 lacos Exp
|
# Makefile,v 1.9 2009/04/03 22:33:49 lacos Exp
|
||||||
.POSIX:
|
.POSIX:
|
||||||
|
|
||||||
-CC=gcc
|
-CC=gcc
|
||||||
-CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
|
-CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
|
||||||
- -O2
|
- -O2
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
+LDFLAGS+= -s
|
+LDFLAGS+= -s
|
||||||
+LIBS+= -l pthread -l bz2
|
+LIBS+= -l pthread -l bz2
|
||||||
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS)
|
-LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS)
|
||||||
-LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS)
|
-LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS)
|
||||||
+all: lbzip2
|
+all: lbzip2
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- src/lha.h.orig Sun Sep 21 15:58:52 2003
|
--- src/lha.h.orig 2006-10-10 16:27:51 UTC
|
||||||
+++ src/lha.h Thu Sep 23 07:10:33 2004
|
+++ src/lha.h
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- Makefile Tue Jun 13 07:21:19 2000
|
--- Makefile.orig 2000-06-13 04:21:19 UTC
|
||||||
+++ Makefile Tue Jun 20 17:44:24 2000
|
+++ Makefile
|
||||||
@@ -14,20 +15,30 @@
|
@@ -14,23 +14,33 @@ OBJS = inflate.o url.o url_file.o url_in
|
||||||
url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \
|
url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \
|
||||||
arc_mime.o
|
arc_mime.o
|
||||||
|
|
||||||
@ -36,3 +36,6 @@
|
|||||||
+
|
+
|
||||||
+.c.so:
|
+.c.so:
|
||||||
+ $(CC) $(CFLAGS) -fPIC -fpic -DPIC -c $(.IMPSRC) -o $(.TARGET)
|
+ $(CC) $(CFLAGS) -fPIC -fpic -DPIC -c $(.IMPSRC) -o $(.TARGET)
|
||||||
|
install::
|
||||||
|
test -d $(PREFIX)/lib || mkdir -p $(PREFIX)/lib
|
||||||
|
$(INSTALL) -m 444 $(LIB) $(PREFIX)/lib
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.orig Tue Aug 19 18:15:11 2003
|
--- Makefile.orig 2016-07-26 12:03:27 UTC
|
||||||
+++ Makefile Tue Aug 19 18:33:06 2003
|
+++ Makefile
|
||||||
@@ -0,0 +1,16 @@
|
@@ -0,0 +1,16 @@
|
||||||
+NO_PROFILE= true
|
+NO_PROFILE= true
|
||||||
+CXXFLAGS+= -Wno-deprecated
|
+CXXFLAGS+= -Wno-deprecated
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- bstring.cpp.orig 2014-07-27 11:17:34.000000000 -0400
|
--- bstring.cpp.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ bstring.cpp 2014-07-27 11:17:37.000000000 -0400
|
+++ bstring.cpp
|
||||||
@@ -15,7 +15,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
|
|
||||||
#include "bstring.h"
|
#include "bstring.h"
|
||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
///////////////////////////////////////***************************************
|
///////////////////////////////////////***************************************
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@
|
@@ -91,7 +91,7 @@ b_string& b_string::operator += (const c
|
||||||
|
|
||||||
b_string b_string::operator + (const char* s)
|
b_string b_string::operator + (const char* s)
|
||||||
{
|
{
|
||||||
@ -18,7 +18,7 @@
|
|||||||
return temp += s;
|
return temp += s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,7 +150,7 @@
|
@@ -150,7 +150,7 @@ b_string& b_string::StpCpy(const char* s
|
||||||
if(strlen(str) < strlen(s)) // If more memory is needed
|
if(strlen(str) < strlen(s)) // If more memory is needed
|
||||||
*this = s; // Use assign function
|
*this = s; // Use assign function
|
||||||
else // If stpcpy can be used
|
else // If stpcpy can be used
|
||||||
@ -27,7 +27,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
return *this; // Return a refrence to this object
|
return *this; // Return a refrence to this object
|
||||||
@@ -217,4 +217,4 @@
|
@@ -217,4 +217,4 @@ istream& operator >> (istream& input, b_
|
||||||
|
|
||||||
//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
|
//*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- bstring.h.orig 1999-10-24 07:29:53.000000000 -0400
|
--- bstring.h.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ bstring.h 2014-02-21 16:09:56.194556928 -0500
|
+++ bstring.h
|
||||||
@@ -21,13 +21,15 @@
|
@@ -21,13 +21,15 @@
|
||||||
#ifndef __BSTRING_HPP__
|
#ifndef __BSTRING_HPP__
|
||||||
#define __BSTRING_HPP__
|
#define __BSTRING_HPP__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfcreate.cpp.orig 1999-10-24 07:29:53.000000000 -0400
|
--- cfcreate.cpp.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ cfcreate.cpp 2014-02-21 15:48:26.812268415 -0500
|
+++ cfcreate.cpp
|
||||||
@@ -29,6 +29,10 @@
|
@@ -29,6 +29,10 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
@ -11,7 +11,7 @@
|
|||||||
///////////////////////////////////////***************************************
|
///////////////////////////////////////***************************************
|
||||||
|
|
||||||
int cfc_fileinfo::write_entry(ostream& out)
|
int cfc_fileinfo::write_entry(ostream& out)
|
||||||
@@ -129,7 +133,7 @@
|
@@ -129,7 +133,7 @@ int cfc_folderinfo::add_file(const char*
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,7 +20,7 @@
|
|||||||
#ifndef unix
|
#ifndef unix
|
||||||
if(getftime(in.rdbuf()->fd(), &datetime) != 0) return GETTIME_FAILURE;
|
if(getftime(in.rdbuf()->fd(), &datetime) != 0) return GETTIME_FAILURE;
|
||||||
#endif
|
#endif
|
||||||
@@ -194,7 +198,7 @@
|
@@ -194,7 +198,7 @@ int cfc_folderinfo::read_block(istream&
|
||||||
unprocessed_data = NULL; // Reset buffer holder
|
unprocessed_data = NULL; // Reset buffer holder
|
||||||
unprocessed_data_len = 0u;
|
unprocessed_data_len = 0u;
|
||||||
|
|
||||||
@ -29,7 +29,7 @@
|
|||||||
{
|
{
|
||||||
delete[] buf;
|
delete[] buf;
|
||||||
buf = NULL;
|
buf = NULL;
|
||||||
@@ -272,7 +276,7 @@
|
@@ -272,7 +276,7 @@ int cfc_folderinfo::process_block(const
|
||||||
return WRITE_ERROR;
|
return WRITE_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfcreate.h.orig 1999-10-24 07:29:53.000000000 -0400
|
--- cfcreate.h.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ cfcreate.h 2014-02-21 15:47:18.116272433 -0500
|
+++ cfcreate.h
|
||||||
@@ -20,6 +20,8 @@
|
@@ -20,6 +20,8 @@
|
||||||
#include "cffile.h"
|
#include "cffile.h"
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#ifdef unix
|
#ifdef unix
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
@@ -211,7 +213,7 @@
|
@@ -211,7 +213,7 @@ class cfc_folderinfo : public ObjectBase
|
||||||
int process_block(const byte* data, word datalen);
|
int process_block(const byte* data, word datalen);
|
||||||
int read_block(istream& in, byte* &buf, int& bytesread);
|
int read_block(istream& in, byte* &buf, int& bytesread);
|
||||||
int compress_block(byte* &dest, word &destlen, byte* src, word srclen);
|
int compress_block(byte* &dest, word &destlen, byte* src, word srclen);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfdblock.cpp.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cfdblock.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfdblock.cpp 2014-02-21 15:49:13.695264850 -0500
|
+++ cfdblock.cpp
|
||||||
@@ -17,7 +17,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
#ifndef __CFDBLOCK_CPP__
|
#ifndef __CFDBLOCK_CPP__
|
||||||
#define __CFDBLOCK_CPP__
|
#define __CFDBLOCK_CPP__
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include "cftypes.h"
|
#include "cftypes.h"
|
||||||
#include "cfdblock.h"
|
#include "cfdblock.h"
|
||||||
#include "cfheader.h"
|
#include "cfheader.h"
|
||||||
@@ -124,7 +124,7 @@
|
@@ -124,7 +124,7 @@ int cabinet_datablock::read(istream& in,
|
||||||
ra_size = cab_header.get_datablock_ra_size();
|
ra_size = cab_header.get_datablock_ra_size();
|
||||||
reserved_area = new byte[ra_size];
|
reserved_area = new byte[ra_size];
|
||||||
|
|
||||||
@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
||||||
}
|
}
|
||||||
@@ -154,7 +154,7 @@
|
@@ -154,7 +154,7 @@ int cabinet_datablock::write(ostream& ou
|
||||||
|
|
||||||
if(ra_size) // If reserve area, write it
|
if(ra_size) // If reserve area, write it
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfdblock.h.orig 2014-02-21 15:49:53.526262379 -0500
|
--- cfdblock.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfdblock.h 2014-02-21 15:50:02.511261600 -0500
|
+++ cfdblock.h
|
||||||
@@ -14,7 +14,7 @@
|
@@ -14,7 +14,7 @@
|
||||||
#ifndef __CFDBLOCK_H__
|
#ifndef __CFDBLOCK_H__
|
||||||
#define __CFDBLOCK_H__
|
#define __CFDBLOCK_H__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffdrmgr.cpp.orig 2014-02-21 15:50:45.048258834 -0500
|
--- cffdrmgr.cpp.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ cffdrmgr.cpp 2014-02-21 15:50:53.033257685 -0500
|
+++ cffdrmgr.cpp
|
||||||
@@ -12,7 +12,7 @@
|
@@ -12,7 +12,7 @@
|
||||||
#ifndef __CFFDRMGR_CPP__
|
#ifndef __CFFDRMGR_CPP__
|
||||||
#define __CFFDRMGR_CPP__
|
#define __CFFDRMGR_CPP__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffdrmgr.h.orig 2014-02-21 15:51:05.912257936 -0500
|
--- cffdrmgr.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cffdrmgr.h 2014-02-21 15:51:13.426256130 -0500
|
+++ cffdrmgr.h
|
||||||
@@ -9,7 +9,7 @@
|
@@ -9,7 +9,7 @@
|
||||||
#ifndef __CFFDRMGR_H__
|
#ifndef __CFFDRMGR_H__
|
||||||
#define __CFFDRMGR_H__
|
#define __CFFDRMGR_H__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffile.cpp.orig 2014-02-21 15:52:54.235249989 -0500
|
--- cffile.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cffile.cpp 2014-02-21 15:53:02.965814752 -0500
|
+++ cffile.cpp
|
||||||
@@ -17,7 +17,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
#ifndef __CFFILE_CPP__
|
#ifndef __CFFILE_CPP__
|
||||||
#define __CFFILE_CPP__
|
#define __CFFILE_CPP__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffile.h.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cffile.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cffile.h 2014-02-21 16:12:05.824389036 -0500
|
+++ cffile.h
|
||||||
@@ -15,7 +15,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
#define __CFFILE_H__
|
#define __CFFILE_H__
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include "bstring.h"
|
#include "bstring.h"
|
||||||
#include "cftypes.h"
|
#include "cftypes.h"
|
||||||
|
|
||||||
@@ -161,4 +161,4 @@
|
@@ -161,4 +161,4 @@ class cabinet_file_header : public cabin
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffolder.cpp.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cffolder.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cffolder.cpp 2014-02-21 15:53:49.255245183 -0500
|
+++ cffolder.cpp
|
||||||
@@ -17,7 +17,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
#ifndef __CFFOLDER_CPP__
|
#ifndef __CFFOLDER_CPP__
|
||||||
#define __CFFOLDER_CPP__
|
#define __CFFOLDER_CPP__
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include "cftypes.h"
|
#include "cftypes.h"
|
||||||
#include "cfheader.h"
|
#include "cfheader.h"
|
||||||
#include "cffolder.h"
|
#include "cffolder.h"
|
||||||
@@ -70,7 +70,7 @@
|
@@ -70,7 +70,7 @@ Error cabinet_folder_header::read(istrea
|
||||||
ra_size = cab_header.get_folder_ra_size();
|
ra_size = cab_header.get_folder_ra_size();
|
||||||
reserved_area = new byte[ra_size];
|
reserved_area = new byte[ra_size];
|
||||||
|
|
||||||
@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
||||||
}
|
}
|
||||||
@@ -90,7 +90,7 @@
|
@@ -90,7 +90,7 @@ Error cabinet_folder_header::write(ostre
|
||||||
|
|
||||||
if(ra_size) // If reserved area present
|
if(ra_size) // If reserved area present
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cffolder.h.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cffolder.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cffolder.h 2014-02-21 15:52:05.724747639 -0500
|
+++ cffolder.h
|
||||||
@@ -15,7 +15,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
#define __CFFOLDER_H__
|
#define __CFFOLDER_H__
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include "cftypes.h"
|
#include "cftypes.h"
|
||||||
#include "cfheader.h"
|
#include "cfheader.h"
|
||||||
|
|
||||||
@@ -89,4 +89,5 @@
|
@@ -89,4 +89,5 @@ class cabinet_folder_header : public cab
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfheader.cpp.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cfheader.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfheader.cpp 2014-02-21 16:02:37.285291121 -0500
|
+++ cfheader.cpp
|
||||||
@@ -18,17 +18,23 @@
|
@@ -18,17 +18,23 @@
|
||||||
#define __CFHEADER_CPP__
|
#define __CFHEADER_CPP__
|
||||||
|
|
||||||
@ -26,7 +26,7 @@
|
|||||||
////////////////////////////////////////****************************************
|
////////////////////////////////////////****************************************
|
||||||
|
|
||||||
// Initializes a valid fixed cabinet header
|
// Initializes a valid fixed cabinet header
|
||||||
@@ -127,7 +133,7 @@
|
@@ -127,7 +133,7 @@ Error cabinet_header::read(istream& in)
|
||||||
{
|
{
|
||||||
reserved_area = new byte[cabinet_ra_size];
|
reserved_area = new byte[cabinet_ra_size];
|
||||||
|
|
||||||
@ -35,7 +35,7 @@
|
|||||||
{
|
{
|
||||||
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
|
||||||
}
|
}
|
||||||
@@ -172,7 +178,7 @@
|
@@ -172,7 +178,7 @@ Error cabinet_header::write(ostream& out
|
||||||
|
|
||||||
if(cabinet_ra_size > 0) // If has cabinet reserved area
|
if(cabinet_ra_size > 0) // If has cabinet reserved area
|
||||||
{
|
{
|
||||||
@ -44,7 +44,7 @@
|
|||||||
{
|
{
|
||||||
return WRITE_ERROR;
|
return WRITE_ERROR;
|
||||||
}
|
}
|
||||||
@@ -210,4 +216,4 @@
|
@@ -210,4 +216,4 @@ Error cabinet_header::write(ostream& out
|
||||||
|
|
||||||
////////////////////////////////////////****************************************
|
////////////////////////////////////////****************************************
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfheader.h.orig 2014-02-21 15:42:52.379291286 -0500
|
--- cfheader.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfheader.h 2014-02-21 16:02:51.918208148 -0500
|
+++ cfheader.h
|
||||||
@@ -15,10 +15,12 @@
|
@@ -15,10 +15,12 @@
|
||||||
#define __CFHEADER_H__
|
#define __CFHEADER_H__
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfreader.cpp.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cfreader.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfreader.cpp 2014-02-21 15:55:15.698239494 -0500
|
+++ cfreader.cpp
|
||||||
@@ -22,7 +22,7 @@
|
@@ -22,7 +22,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cfreader.h.orig 2014-02-21 16:11:11.770180090 -0500
|
--- cfreader.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cfreader.h 2014-02-21 16:10:41.259844074 -0500
|
+++ cfreader.h
|
||||||
@@ -11,7 +11,7 @@
|
@@ -11,7 +11,7 @@
|
||||||
#ifndef __CFREADER_H__
|
#ifndef __CFREADER_H__
|
||||||
#define __CFREADER_H__
|
#define __CFREADER_H__
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cftypes.cpp.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cftypes.cpp.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cftypes.cpp 2014-02-21 16:06:43.971192116 -0500
|
+++ cftypes.cpp
|
||||||
@@ -10,11 +10,20 @@
|
@@ -10,11 +10,20 @@
|
||||||
#ifndef __CFTYPES_CPP__
|
#ifndef __CFTYPES_CPP__
|
||||||
#define __CFTYPES_CPP__
|
#define __CFTYPES_CPP__
|
||||||
@ -23,7 +23,7 @@
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
int convert_z_error_code(int code)
|
int convert_z_error_code(int code)
|
||||||
@@ -138,15 +147,20 @@
|
@@ -138,15 +147,20 @@ const char* get_cabinet_error_string(int
|
||||||
|
|
||||||
int io_read(istream& in, byte* buf, word len)
|
int io_read(istream& in, byte* buf, word len)
|
||||||
{
|
{
|
||||||
@ -49,7 +49,7 @@
|
|||||||
? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK;
|
? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,14 +168,19 @@
|
@@ -154,14 +168,19 @@ int io_read(istream& in, byte* buf, word
|
||||||
|
|
||||||
int io_write(ostream& out, const byte* buf, word len)
|
int io_write(ostream& out, const byte* buf, word len)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- cftypes.h.orig 1999-10-24 02:13:29.000000000 -0400
|
--- cftypes.h.orig 1999-10-24 06:13:29 UTC
|
||||||
+++ cftypes.h 2014-02-21 15:42:11.491293648 -0500
|
+++ cftypes.h
|
||||||
@@ -16,7 +16,10 @@
|
@@ -16,7 +16,10 @@
|
||||||
#ifndef __CFTYPES_H__
|
#ifndef __CFTYPES_H__
|
||||||
#define __CFTYPES_H__
|
#define __CFTYPES_H__
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- darray.h.orig Sun Aug 31 05:55:31 2003
|
--- darray.h.orig 1999-10-24 11:29:53 UTC
|
||||||
+++ darray.h Sun Aug 31 05:55:32 2003
|
+++ darray.h
|
||||||
@@ -155,4 +155,4 @@
|
@@ -155,4 +155,4 @@ void dynamic_array<ObjectType>::reset(si
|
||||||
|
|
||||||
///////////////////////////////////////***************************************
|
///////////////////////////////////////***************************************
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- listcab.cpp.orig 1999-10-24 08:11:38.000000000 -0400
|
--- listcab.cpp.orig 1999-10-24 12:11:38 UTC
|
||||||
+++ listcab.cpp 2014-02-21 16:14:29.246853465 -0500
|
+++ listcab.cpp
|
||||||
@@ -8,8 +8,8 @@
|
@@ -8,8 +8,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -22,7 +22,7 @@
|
|||||||
////////////////////////////////////////****************************************
|
////////////////////////////////////////****************************************
|
||||||
|
|
||||||
void display_header_info(cabinet_header& cfh);
|
void display_header_info(cabinet_header& cfh);
|
||||||
@@ -47,13 +51,19 @@
|
@@ -47,13 +51,19 @@ int main(int argc, char *argv[])
|
||||||
cerr << "New Folder Error: " << retval << endl;
|
cerr << "New Folder Error: " << retval << endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -46,7 +46,7 @@
|
|||||||
if((retval = cab.add_file(filename)) != OK)
|
if((retval = cab.add_file(filename)) != OK)
|
||||||
{
|
{
|
||||||
perror("read");
|
perror("read");
|
||||||
@@ -62,10 +72,13 @@
|
@@ -62,10 +72,13 @@ int main(int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- configure.orig 2003-03-06 07:31:05.000000000 +0300
|
--- configure.orig 2003-03-06 04:31:05 UTC
|
||||||
+++ configure 2009-11-04 07:04:24.000000000 +0300
|
+++ configure
|
||||||
@@ -9263,7 +9263,7 @@
|
@@ -9263,7 +9263,7 @@ if test "x$static_scheme_curl" = "xyes";
|
||||||
extern_scheme_init="$extern_scheme_init CxSchemeOps *init_curl_scheme_module(void);"
|
extern_scheme_init="$extern_scheme_init CxSchemeOps *init_curl_scheme_module(void);"
|
||||||
load_scheme_mod="$load_scheme_mod init_curl_scheme_module();"
|
load_scheme_mod="$load_scheme_mod init_curl_scheme_module();"
|
||||||
else
|
else
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- modules/archive/zip/header.c.orig Sun Aug 15 18:08:32 2004
|
--- modules/archive/zip/header.c.orig 2003-01-01 06:22:34 UTC
|
||||||
+++ modules/archive/zip/header.c Sun Aug 15 18:08:34 2004
|
+++ modules/archive/zip/header.c
|
||||||
@@ -25,7 +25,7 @@
|
@@ -25,7 +25,7 @@
|
||||||
#include "zip.h"
|
#include "zip.h"
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- tests/extractarchive.c.orig Fri Dec 20 08:03:40 2002
|
--- tests/extractarchive.c.orig 2002-12-19 23:03:40 UTC
|
||||||
+++ tests/extractarchive.c Mon Jun 23 13:16:14 2003
|
+++ tests/extractarchive.c
|
||||||
@@ -37,7 +37,9 @@
|
@@ -37,7 +37,9 @@
|
||||||
void
|
void
|
||||||
__extractprogress(CxArchive *archive, CxFile *file, size_t onFile, size_t fileCount)
|
__extractprogress(CxArchive *archive, CxFile *file, size_t onFile, size_t fileCount)
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
Index: lz_nonslide.c
|
--- lz_nonslide.c.orig 2005-07-06 02:17:46 UTC
|
||||||
|
+++ lz_nonslide.c
|
||||||
@@ -19,10 +19,11 @@
|
@@ -19,10 +19,11 @@
|
||||||
/*
|
/*
|
||||||
* Document here
|
* Document here
|
||||||
@ -1,5 +1,5 @@
|
|||||||
--- lib/inno.h.orig 2008-05-22 15:55:23.000000000 +1000
|
--- lib/inno.h.orig 2007-11-29 13:50:20 UTC
|
||||||
+++ lib/inno.h 2008-05-22 15:57:49.000000000 +1000
|
+++ lib/inno.h
|
||||||
@@ -3,7 +3,7 @@
|
@@ -3,7 +3,7 @@
|
||||||
#define __inno_h__
|
#define __inno_h__
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@
|
@@ -99,7 +99,7 @@ typedef struct
|
||||||
uint32_t NumUninstallDeleteEntries;
|
uint32_t NumUninstallDeleteEntries;
|
||||||
uint32_t NumRunEntries;
|
uint32_t NumRunEntries;
|
||||||
uint32_t NumUninstallRunEntries;
|
uint32_t NumUninstallRunEntries;
|
||||||
@ -18,7 +18,7 @@
|
|||||||
} TSetupHeader;
|
} TSetupHeader;
|
||||||
|
|
||||||
#define SETUP_HEADER_SIZE 0xd9
|
#define SETUP_HEADER_SIZE 0xd9
|
||||||
@@ -143,9 +143,9 @@
|
@@ -143,9 +143,9 @@ typedef enum
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@ -31,7 +31,7 @@
|
|||||||
} TSetupVersionData;
|
} TSetupVersionData;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
@@ -172,12 +172,12 @@
|
@@ -172,12 +172,12 @@ typedef struct
|
||||||
char* InstallFontName;
|
char* InstallFontName;
|
||||||
char* Components;
|
char* Components;
|
||||||
char* Tasks;
|
char* Tasks;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
diff -ruN unrar.orig/dll.cpp unrar/dll.cpp
|
--- dll.cpp.orig 2010-03-15 06:30:52 UTC
|
||||||
+++ dll.cpp
|
+++ dll.cpp
|
||||||
@@ -272,7 +272,9 @@
|
@@ -281,7 +281,9 @@ int PASCAL ProcessFile(HANDLE hArcData,i
|
||||||
strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
|
strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
|
||||||
Data->Cmd.Test=Operation!=RAR_EXTRACT;
|
Data->Cmd.Test=Operation!=RAR_EXTRACT;
|
||||||
bool Repeat=false;
|
bool Repeat=false;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- dll.hpp 2008-11-06 01:37:37.000000000 +0100
|
--- dll.hpp.orig 2010-03-15 06:30:53 UTC
|
||||||
+++ dll.hpp 2008-11-06 01:38:47.000000000 +0100
|
+++ dll.hpp
|
||||||
@@ -28,14 +28,14 @@
|
@@ -28,14 +28,14 @@
|
||||||
|
|
||||||
#define RAR_DLL_VERSION 4
|
#define RAR_DLL_VERSION 4
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- extract.cpp.orig 2009-06-30 09:18:53.000000000 +0300
|
--- extract.cpp.orig 2010-03-15 06:30:52 UTC
|
||||||
+++ extract.cpp 2009-07-09 10:02:21.000000000 +0300
|
+++ extract.cpp
|
||||||
@@ -354,6 +354,7 @@
|
@@ -354,6 +354,7 @@ bool CmdExtract::ExtractCurrentFile(Comm
|
||||||
char CurVolName[NM];
|
char CurVolName[NM];
|
||||||
strcpy(CurVolName,ArcName);
|
strcpy(CurVolName,ArcName);
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- makefile.unix.orig 2008-10-09 15:43:06.000000000 +0200
|
--- makefile.unix.orig 2009-05-03 05:18:45 UTC
|
||||||
+++ makefile.unix 2008-11-06 01:43:52.000000000 +0100
|
+++ makefile.unix
|
||||||
@@ -7,10 +7,11 @@
|
@@ -7,10 +7,11 @@
|
||||||
|
|
||||||
# Linux using GCC
|
# Linux using GCC
|
||||||
@ -14,16 +14,16 @@
|
|||||||
|
|
||||||
# Linux using LCC
|
# Linux using LCC
|
||||||
#CXX=lcc
|
#CXX=lcc
|
||||||
@@ -100,7 +101,7 @@
|
@@ -100,7 +101,7 @@ LINK=$(CXX)
|
||||||
WHAT=UNRAR
|
WHAT=UNRAR
|
||||||
|
|
||||||
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
|
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
|
||||||
-LIB_OBJ=filestr.o scantree.o dll.o
|
-LIB_OBJ=filestr.o scantree.o dll.o
|
||||||
+LIB_OBJ=dll.o
|
+LIB_OBJ=dll.o
|
||||||
|
|
||||||
OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
|
OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o filefn.o filcreat.o \
|
||||||
archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
|
archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
|
||||||
@@ -131,9 +132,15 @@
|
@@ -131,9 +132,15 @@ sfx: $(OBJECTS)
|
||||||
$(STRIP) default.sfx
|
$(STRIP) default.sfx
|
||||||
|
|
||||||
lib: WHAT=RARDLL
|
lib: WHAT=RARDLL
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- lib/Makefile.in.orig 2015-08-26 18:39:20 UTC
|
--- lib/Makefile.in.orig 2016-02-19 14:21:44 UTC
|
||||||
+++ lib/Makefile.in
|
+++ lib/Makefile.in
|
||||||
@@ -355,8 +355,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@
|
@@ -367,8 +367,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@
|
||||||
libincludedir = ${libdir}/@PACKAGE@/include
|
libincludedir = ${libdir}/@PACKAGE@/include
|
||||||
lib_LTLIBRARIES = libzip.la
|
lib_LTLIBRARIES = libzip.la
|
||||||
noinst_HEADERS = zipint.h
|
noinst_HEADERS = zipint.h
|
||||||
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
# also update CMakeLists.txt when changing version
|
# also update CMakeLists.txt when changing version
|
||||||
libzip_la_LDFLAGS = -no-undefined -version-info 4:0:0
|
libzip_la_LDFLAGS = -no-undefined -version-info 4:0:0
|
||||||
@@ -869,8 +869,7 @@ info: info-am
|
@@ -882,8 +882,7 @@ info: info-am
|
||||||
|
|
||||||
info-am:
|
info-am:
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
--- libzip.pc.in.orig 2014-03-08 20:13:21 UTC
|
--- libzip.pc.in.orig 2014-08-12 12:48:41 UTC
|
||||||
+++ libzip.pc.in
|
+++ libzip.pc.in
|
||||||
@@ -2,7 +2,6 @@ prefix=@prefix@
|
@@ -2,7 +2,6 @@ prefix=@prefix@
|
||||||
exec_prefix=@exec_prefix@
|
exec_prefix=@exec_prefix@
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
--- lrzip_private.h.orig 2015-03-10 09:25:42 UTC
|
--- lrzip_private.h.orig 2016-06-09 05:01:44 UTC
|
||||||
+++ lrzip_private.h
|
+++ lrzip_private.h
|
||||||
@@ -47,7 +47,7 @@
|
@@ -47,7 +47,7 @@
|
||||||
#ifdef HAVE_ALLOCA_H
|
#ifdef HAVE_ALLOCA_H
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- ./include/lzo/lzodefs.h.orig 2014-06-25 15:47:13.000000000 +0200
|
--- include/lzo/lzodefs.h.orig 2015-02-04 11:24:51 UTC
|
||||||
+++ ./include/lzo/lzodefs.h 2014-06-27 06:31:33.000000000 +0200
|
+++ include/lzo/lzodefs.h
|
||||||
@@ -29,6 +29,8 @@
|
@@ -29,6 +29,8 @@
|
||||||
#ifndef __LZODEFS_H_INCLUDED
|
#ifndef __LZODEFS_H_INCLUDED
|
||||||
#define __LZODEFS_H_INCLUDED 1
|
#define __LZODEFS_H_INCLUDED 1
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
--- crc/makefile.orig Sun Oct 19 01:17:42 2003
|
--- crc/makefile.orig 1993-10-02 20:16:00 UTC
|
||||||
+++ crc/makefile Sun Oct 19 01:18:15 2003
|
+++ crc/makefile
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
-CFLAGS = -O $(CF)
|
-CFLAGS = -O $(CF)
|
||||||
+CFLAGS += $(CF)
|
+CFLAGS += $(CF)
|
||||||
CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c
|
CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c
|
||||||
CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o
|
CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
@@ -16,7 +16,7 @@ $(CRCC): makecrc
|
||||||
./makecrc
|
./makecrc
|
||||||
|
|
||||||
makecrc: makecrc.o
|
makecrc: makecrc.o
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user