diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-08-19 23:59:17 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-08-20 09:00:30 +0200 |
commit | 536db4a134a0ade7c5ef2a2fa1dd92dbacc35093 (patch) | |
tree | 4eb8feddfbae2e20ce4e6025aeae431ca32fc914 /source/ap | |
parent | 865737c0c7ba343b8351dab8bfaa0b6932275b52 (diff) | |
download | current-536db4a134a0ade7c5ef2a2fa1dd92dbacc35093.tar.gz |
Sun Aug 19 23:59:17 UTC 201820180819235917
a/e2fsprogs-1.44.4-x86_64-1.txz: Upgraded.
a/kernel-generic-4.14.65-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.65-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.65-x86_64-1.txz: Upgraded.
ap/jove-4.16.0.73-x86_64-6.txz: Rebuilt.
Fixed getline() namespace collision patch.
ap/sudo-1.8.24-x86_64-1.txz: Upgraded.
d/icecream-20180808-x86_64-1.txz: Upgraded.
Use sources from git, which avoids timeouts and hangs that have been
observed with version 1.1, and adds additional support for clang.
d/kernel-headers-4.14.65-x86-1.txz: Upgraded.
k/kernel-source-4.14.65-noarch-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap')
-rwxr-xr-x | source/ap/jove/jove.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/jove/jove.getline.buffsiz.diff | 74 |
2 files changed, 59 insertions, 17 deletions
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild index cf003688..2c560fe4 100755 --- a/source/ap/jove/jove.SlackBuild +++ b/source/ap/jove/jove.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=jove VERSION=4.16.0.73 -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/jove/jove.getline.buffsiz.diff b/source/ap/jove/jove.getline.buffsiz.diff index 59b79c52..ffc1e99c 100644 --- a/source/ap/jove/jove.getline.buffsiz.diff +++ b/source/ap/jove/jove.getline.buffsiz.diff @@ -1,5 +1,5 @@ --- ./fp.h.orig 2002-03-20 15:49:38.000000000 -0600 -+++ ./fp.h 2018-08-16 12:43:15.763002319 -0500 ++++ ./fp.h 2018-08-19 13:12:52.539005346 -0500 @@ -17,7 +17,8 @@ # define scr_putchar(c) f_putc((c), jstdout) extern void flushscreen proto((void)); @@ -10,9 +10,29 @@ # else # define MAXTTYBUF 512 # endif +--- ./recover.c.orig 2010-07-09 01:29:37.000000000 -0500 ++++ ./recover.c 2018-08-19 13:13:12.904005347 -0500 +@@ -166,7 +166,7 @@ + private char *getblock proto((daddr atl)); + + void +-getline(tl, buf) ++j_getline(tl, buf) + daddr tl; + char *buf; + { +@@ -597,7 +597,7 @@ + Nchars = Nlines = 0L; + while (--nlines >= 0) { + addr = getaddr(ptrs_fp); +- getline(addr, buf); ++ j_getline(addr, buf); + Nlines += 1; + Nchars += 1 + strlen(buf); + fputs(buf, out); --- ./insert.c.orig 2002-03-20 15:49:38.000000000 -0600 -+++ ./insert.c 2018-08-16 12:43:15.773002319 -0500 -@@ -504,7 +506,7 @@ ++++ ./insert.c 2018-08-19 13:13:12.905005347 -0500 +@@ -504,7 +504,7 @@ atchar = 0; } @@ -22,7 +42,7 @@ linecopy(genbuf, atchar, save); atline->l_dline = putline(genbuf); --- ./jove.h.orig 2002-03-20 15:49:38.000000000 -0600 -+++ ./jove.h 2018-08-16 12:43:15.797002319 -0500 ++++ ./jove.h 2018-08-19 13:12:52.540005346 -0500 @@ -267,7 +267,8 @@ /* term.c: universal termcap-like declarations */ @@ -33,19 +53,30 @@ extern int SG, /* number of magic cookies left by SO and SE */ ---- ./io.h.orig 2002-03-20 15:49:38.000000000 -0600 -+++ ./io.h 2018-08-16 12:43:15.790002319 -0500 -@@ -40,7 +40,7 @@ - close_file proto((File *fp)), - d_cache_init proto((void)), - file_write proto((char *fname, bool app)), -- getline proto((daddr addr, char *buf)), -+ j_getline proto((daddr addr, char *buf)), - lsave proto((void)), - putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)), - read_file proto((char *file, bool is_insert)), +--- ./util.h.orig 2004-02-01 13:38:29.000000000 -0600 ++++ ./util.h 2018-08-19 13:13:12.906005347 -0500 +@@ -18,7 +18,7 @@ + #define eobp() (lastp(curline) && eolp()) + #define eolp() (linebuf[curchar] == '\0') + #define firstp(line) ((line) == curbuf->b_first) +-#define getDOT() getline(curline->l_dline, linebuf) ++#define getDOT() j_getline(curline->l_dline, linebuf) + #define lastp(line) ((line) == curbuf->b_last) + + extern UnivPtr +--- ./temp.h.orig 2002-03-20 15:49:39.000000000 -0600 ++++ ./temp.h 2018-08-19 13:13:12.907005347 -0500 +@@ -12,7 +12,7 @@ + * Yank and Kill are really easy; basically all we do is make copies + * of the disk addresses of the lines (as opposed to the contents). + * So, putline(char *buf) writes buf to the disk and returns a new +- * disk address. getline(daddr addr, char *buf) is the opposite of ++ * disk address. j_getline(daddr addr, char *buf) is the opposite of + * putline(). f_getputl(LinePtr line, File fp) reads from open fp + * directly into the tmp file (into the buffer cache (see below)) + * and stores the address in line. This is used during read_file to --- ./io.c.orig 2010-04-16 00:41:46.000000000 -0500 -+++ ./io.c 2018-08-16 12:43:15.782002319 -0500 ++++ ./io.c 2018-08-19 13:13:12.909005347 -0500 @@ -1356,9 +1356,9 @@ void @@ -58,3 +89,14 @@ daddr addr; register char *buf; #endif +--- ./util.c.orig 2004-02-01 13:38:29.000000000 -0600 ++++ ./util.c 2018-08-19 13:13:12.909005347 -0500 +@@ -280,7 +280,7 @@ + strcpy(buf, linebuf); + Jr_Len = strlen(linebuf); + } else +- getline(line->l_dline, buf); ++ j_getline(line->l_dline, buf); + return buf; + } + |