From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/ap/sc/sc-7.16-3.diff | 538 -------------------------------------------- source/ap/sc/sc-7.16.lsm | 17 -- source/ap/sc/sc.SlackBuild | 96 -------- source/ap/sc/slack-desc | 19 -- 4 files changed, 670 deletions(-) delete mode 100644 source/ap/sc/sc-7.16-3.diff delete mode 100644 source/ap/sc/sc-7.16.lsm delete mode 100755 source/ap/sc/sc.SlackBuild delete mode 100644 source/ap/sc/slack-desc (limited to 'source/ap/sc') diff --git a/source/ap/sc/sc-7.16-3.diff b/source/ap/sc/sc-7.16-3.diff deleted file mode 100644 index 2de64aaef..000000000 --- a/source/ap/sc/sc-7.16-3.diff +++ /dev/null @@ -1,538 +0,0 @@ -Description: Upstream changes introduced in version 7.16-3 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - sc (7.16-3) unstable; urgency=low - . - * Changed maintainer to the new email address, recursively. - * Fixed old changelog entries' bug closing method - * Add patches supplied by Carsten Hey - + Stop compressing tutorial.sc file (closes: #514777) - + Use default colors (closes: #514775) - * Bump Standards to 3.8.4. - * Bump dependency of debhelper. - . - The person named in the Author field signed this changelog entry. -Author: Adam Majer -Bug-Debian: http://bugs.debian.org/514775 -Bug-Debian: http://bugs.debian.org/514777 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- sc-7.16.orig/abbrev.c -+++ sc-7.16/abbrev.c -@@ -19,10 +19,15 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - static struct abbrev *abbr_base; - -+int are_abbrevs(void); -+ -+ - void - add_abbr(char *string) - { -@@ -87,7 +92,7 @@ add_abbr(char *string) - } - } - -- if (expansion == NULL) -+ if (expansion == NULL){ - if ((a = find_abbr(string, strlen(string), &prev))) { - error("abbrev \"%s %s\"", a->abbr, a->exp); - return; -@@ -95,6 +100,7 @@ add_abbr(char *string) - error("abreviation \"%s\" doesn't exist", string); - return; - } -+ } - - if (find_abbr(string, strlen(string), &prev)) - del_abbr(string); -@@ -122,7 +128,7 @@ void - del_abbr(char *abbrev) - { - struct abbrev *a; -- struct abbrev **prev; -+ struct abbrev **prev=0; - - if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) - return; ---- sc-7.16.orig/cmds.c -+++ sc-7.16/cmds.c -@@ -478,7 +478,7 @@ yankrow(int arg) - int i, qtmp; - char buf[50]; - struct frange *fr; -- struct ent *obuf; -+ struct ent *obuf=0; - - if ((fr = find_frange(currow, curcol))) - rs = fr->or_right->row - currow + 1; -@@ -535,7 +535,7 @@ yankcol(int arg) - int cs = maxcol - curcol + 1; - int i, qtmp; - char buf[50]; -- struct ent *obuf; -+ struct ent *obuf=0; - - if (cs - arg < 0) { - cs = cs > 0 ? cs : 0; -@@ -810,7 +810,7 @@ pullcells(int to_insert) - - if (to_insert == 'r') { - insertrow(numrows, 0); -- if (fr = find_frange(currow, curcol)) -+ if ((fr = find_frange(currow, curcol))) - deltac = fr->or_left->col - mincol; - else { - for (i = 0; i < numrows; i++) -@@ -2279,7 +2279,7 @@ copye(register struct enode *e, int Rdel - ret->e.r.right.vp = lookat(newrow, newcol); - ret->e.r.right.vf = e->e.r.right.vf; - } else { -- struct enode *temprange; -+ struct enode *temprange=0; - - if (freeenodes) { - ret = freeenodes; -@@ -2337,8 +2337,7 @@ copye(register struct enode *e, int Rdel - break; - case 'f': - case 'F': -- if (range && ret->op == 'F' || -- !range && ret->op == 'f') -+ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) - Rdelta = Cdelta = 0; - ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, - r1, c1, r2, c2, transpose); -@@ -2798,7 +2797,7 @@ void - write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) - { - register struct ent **pp; -- int r, c, rs, cs, mf; -+ int r, c, rs=0, cs=0, mf; - char *dpointptr; - - mf = modflg; -@@ -2861,12 +2860,12 @@ writefile(char *fname, int r0, int c0, i - if ((plugin = findplugin(p+1, 'w')) != NULL) { - if (!plugin_exists(plugin, strlen(plugin), save + 1)) { - error("plugin not found"); -- return; -+ return -1; - } - *save = '|'; - if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { - error("Path too long"); -- return; -+ return -1; - } - sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); - sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); -@@ -2883,13 +2882,14 @@ writefile(char *fname, int r0, int c0, i - } - #endif /* VMS */ - -- if (*fname == '\0') -+ if (*fname == '\0'){ - if (isatty(STDOUT_FILENO) || *curfile != '\0') - fname = curfile; - else { - write_fd(stdout, r0, c0, rn, cn); - return (0); - } -+ } - - #ifdef MSDOS - namelen = 12; -@@ -2981,12 +2981,12 @@ readfile(char *fname, int eraseflg) - if ((plugin = findplugin(p+1, 'r')) != NULL) { - if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { - error("plugin not found"); -- return; -+ return -1; - } - *save = '|'; - if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { - error("Path too long"); -- return; -+ return -1; - } - sprintf(save + strlen(save), " \"%s\"", fname); - eraseflg = 0; ---- sc-7.16.orig/color.c -+++ sc-7.16/color.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "sc.h" - - /* a linked list of free [struct ent]'s, uses .next as the pointer */ -@@ -30,6 +31,8 @@ static struct crange *color_base; - void - initcolor(int colornum) - { -+ use_default_colors(); -+ - if (!colornum) { - int i; - ---- sc-7.16.orig/frame.c -+++ sc-7.16/frame.c -@@ -18,6 +18,9 @@ - - #include - #include -+#include -+#include -+#include - #include "sc.h" - - static struct frange *frame_base; ---- sc-7.16.orig/help.c -+++ sc-7.16/help.c -@@ -11,6 +11,7 @@ char *header = " Quick Reference"; - char *revision = "$Revision: 7.16 $"; - #else - #include -+#include - #include "sc.h" - #endif /* QREF */ - ---- sc-7.16.orig/interp.c -+++ sc-7.16/interp.c -@@ -1572,12 +1572,12 @@ void - copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) - { - struct ent *p; -- struct ent *n; -+/* struct ent *n;*/ - static int minsr = -1, minsc = -1; - static int maxsr = -1, maxsc = -1; - int mindr, mindc; - int maxdr, maxdc; -- int vr, vc; -+/* int vr, vc;*/ - int r, c; - int deltar, deltac; - -@@ -2066,7 +2066,7 @@ str_search(char *s, int firstrow, int fi - *line = '\0'; - } - } -- if (!col_hidden[c]) -+ if (!col_hidden[c]){ - if (gs.g_type == G_STR) { - if (p && p->label - #if defined(REGCOMP) -@@ -2099,6 +2099,7 @@ str_search(char *s, int firstrow, int fi - #endif - #endif - break; -+ } - if (r == endr && c == endc) { - error("String not found"); - #if defined(REGCOMP) -@@ -2471,13 +2472,11 @@ clearent(struct ent *v) - int - constant(register struct enode *e) - { -- return ( -- e == NULL -+ return e == NULL - || e->op == O_CONST - || e->op == O_SCONST -- || e->op == 'm' && constant(e->e.o.left) -- || ( -- e->op != O_VAR -+ || (e->op == 'm' && constant(e->e.o.left)) -+ || (e->op != O_VAR - && !(e->op & REDUCE) - && constant(e->e.o.left) - && constant(e->e.o.right) -@@ -2491,9 +2490,7 @@ constant(register struct enode *e) - && e->op != LASTCOL - && e->op != NUMITER - && e->op != FILENAME -- && optimize -- ) -- ); -+ && optimize ); - } - - void ---- sc-7.16.orig/lex.c -+++ sc-7.16/lex.c -@@ -34,6 +34,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - #ifdef NONOTIMEOUT -@@ -107,7 +109,7 @@ int - yylex() - { - char *p = line + linelim; -- int ret; -+ int ret=0; - static int isfunc = 0; - static bool isgoto = 0; - static bool colstate = 0; -@@ -326,7 +328,7 @@ plugin_exists(char *name, int len, char - strcpy((char *)path, HomeDir); - strcat((char *)path, "/.sc/plugins/"); - strncat((char *)path, name, len); -- if (fp = fopen((char *)path, "r")) { -+ if ((fp = fopen((char *)path, "r"))) { - fclose(fp); - return 1; - } -@@ -334,7 +336,7 @@ plugin_exists(char *name, int len, char - strcpy((char *)path, LIBDIR); - strcat((char *)path, "/plugins/"); - strncat((char *)path, name, len); -- if (fp = fopen((char *)path, "r")) { -+ if ((fp = fopen((char *)path, "r"))) { - fclose(fp); - return 1; - } ---- sc-7.16.orig/Makefile -+++ sc-7.16/Makefile -@@ -32,7 +32,7 @@ MANMODE=644 - - # This is where the library file (tutorial) goes. - #LIBDIR=/usr/local/share/$(name) # reno --LIBDIR=${prefix}/lib/$(name) -+LIBDIR=${prefix}/share/doc/$(name) - LIBRARY=-DLIBDIR=\"${LIBDIR}\" - - # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up ---- sc-7.16.orig/range.c -+++ sc-7.16/range.c -@@ -18,6 +18,8 @@ - - #include - #include -+#include -+#include - #include "sc.h" - - static struct range *rng_base; ---- sc-7.16.orig/sc.c -+++ sc-7.16/sc.c -@@ -212,7 +212,7 @@ flush_saved() - - if (dbidx < 0) - return; -- if (p = delbuf[dbidx]) { -+ if ((p = delbuf[dbidx])) { - scxfree(delbuffmt[dbidx]); - delbuffmt[dbidx] = NULL; - } -@@ -845,7 +845,7 @@ main (int argc, char **argv) - break; - case 'C': - color = !color; -- if (has_colors()) -+ if (has_colors()){ - if (color) { - attron(COLOR_PAIR(1)); - bkgd(COLOR_PAIR(1) | ' '); -@@ -853,6 +853,7 @@ main (int argc, char **argv) - attron(COLOR_PAIR(0)); - bkgd(COLOR_PAIR(0) | ' '); - } -+ } - error("Color %sabled.", color ? "en" : "dis"); - break; - case 'N': ---- sc-7.16.orig/sc.h -+++ sc-7.16/sc.h -@@ -612,6 +612,9 @@ extern int pagesize; /* If nonzero, use - extern int rowlimit; - extern int collimit; - -+void yankr(struct ent *v1, struct ent *v2); -+ -+ - #if BSD42 || SYSIII - - #ifndef cbreak ---- sc-7.16.orig/screen.c -+++ sc-7.16/screen.c -@@ -234,11 +234,12 @@ update(int anychanged) /* did any cell - i = stcol; - lcols = 0; - col = rescol + frcols; -- if (fr && stcol >= fr->or_left->col) -+ if (fr && stcol >= fr->or_left->col){ - if (stcol < fr->ir_left->col) - i = fr->or_left->col; - else - col += flcols; -+ } - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && - i < maxcols; i++) { - lcols++; -@@ -328,11 +329,12 @@ update(int anychanged) /* did any cell - i = stcol; - lcols = 0; - col = rescol + frcols; -- if (fr && stcol >= fr->or_left->col) -+ if (fr && stcol >= fr->or_left->col){ - if (stcol < fr->ir_left->col) - i = fr->or_left->col; - else - col += flcols; -+ } - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && - i < maxcols; i++) { - lcols++; -@@ -377,11 +379,12 @@ update(int anychanged) /* did any cell - i = strow; - rows = 0; - row = RESROW + fbrows; -- if (fr && strow >= fr->or_left->row) -+ if (fr && strow >= fr->or_left->row){ - if (strow < fr->ir_left->row) - i = fr->or_left->row; - else - row += ftrows; -+ } - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; - i++) { - rows++; -@@ -460,11 +463,12 @@ update(int anychanged) /* did any cell - i = strow; - rows = 0; - row = RESROW + fbrows; -- if (fr && strow >= fr->or_left->row) -+ if (fr && strow >= fr->or_left->row){ - if (strow < fr->ir_left->row) - i = fr->or_left->row; - else - row += ftrows; -+ } - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; - i++) { - rows++; ---- sc-7.16.orig/sort.c -+++ sc-7.16/sort.c -@@ -19,6 +19,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - int compare(const void *row1, const void *row2); ---- sc-7.16.orig/vi.c -+++ sc-7.16/vi.c -@@ -17,6 +17,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - #if defined(REGCOMP) -@@ -40,7 +42,7 @@ void gotobottom(); - - #define istext(a) (isalnum(a) || ((a) == '_')) - --#define bool int -+/*#define bool int*/ - #define true 1 - #define false 0 - -@@ -667,8 +669,10 @@ dotab() - static struct range *nextmatch; - int len; - -- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || -- (completethis && line[linelim-1] == ' ')) { -+ if ((linelim > 0 && isalnum(line[linelim-1])) || -+ line[linelim-1] == '_' || -+ (completethis && line[linelim-1] == ' ')) { -+ - if (!completethis) { - for (completethis = line + linelim - 1; isalnum(*completethis) || - *completethis == '_'; completethis--) /* */; -@@ -715,7 +719,7 @@ void - showdr() - { - int minsr, minsc, maxsr, maxsc; -- char *p; -+ /*char *p;*/ - char r[12]; - struct frange *fr = find_frange(currow, curcol); - -@@ -1566,7 +1570,7 @@ static void - search_again(bool reverse) - { - int prev_match; -- int found_it; -+ int found_it=0; - #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) - char *look_here; - int do_next; -@@ -1777,7 +1781,7 @@ to_char(int arg, int n) - static void - match_paren() - { -- register int i; -+ /*register int i;*/ - int nest = 1; - int tmp = linelim; - ---- sc-7.16.orig/vmtbl.c -+++ sc-7.16/vmtbl.c -@@ -16,6 +16,7 @@ - # include - #endif /* PSC */ - -+#include - #include "sc.h" - - /* ---- sc-7.16.orig/xmalloc.c -+++ sc-7.16/xmalloc.c -@@ -4,11 +4,12 @@ - */ - - #include -+#include - #include "sc.h" - --extern char *malloc(); -+/* extern char *malloc(); - extern char *realloc(); --extern void free(); -+extern void free(); */ - void fatal(); - - #ifdef SYSV3 diff --git a/source/ap/sc/sc-7.16.lsm b/source/ap/sc/sc-7.16.lsm deleted file mode 100644 index e37be385e..000000000 --- a/source/ap/sc/sc-7.16.lsm +++ /dev/null @@ -1,17 +0,0 @@ -Begin4 -Title: sc Spreadsheet Calculator -Version: 7.16 -Entered-date: 2002-9-19 -Description: sc is a free curses-based spreadsheet program that uses - key bindings similar to vi and less. -Keywords: spreadsheet calculator console textmode curses ncurses -Author: Too numerous to mention. -Maintained-by: nrocinu@myrealbox.com (Chuck Martin) -Primary-site: ibiblio.org /pub/Linux/apps/financial/spreadsheet -Alternate-site: -Original-site: -Platforms: Pre-7.x versions presumably worked on any Unix or Unix - clone, as well as VMS and DOS. Hopefully, this is still - true, but it's only been tested on Linux. -Copying-policy: Public domain -End diff --git a/source/ap/sc/sc.SlackBuild b/source/ap/sc/sc.SlackBuild deleted file mode 100755 index b37a9e755..000000000 --- a/source/ap/sc/sc.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -VERSION=7.16 -BUILD=${BUILD:-4} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-sc - -rm -rf $PKG -mkdir -p $TMP $PKG - -# Explode the package framework: -cd $PKG -explodepkg $CWD/_sc.tar.gz -mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} - -cd $TMP -tar xvf $CWD/sc-$VERSION.tar.gz || exit 1 -cd sc-$VERSION || exit 1 - -# Old software, modern compiler: -zcat $CWD/sc-7.16-3.diff.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -make || exit 1 - -cat sc > $PKG/usr/bin/sc -cat scqref > $PKG/usr/bin/scqref -cat psc > $PKG/usr/bin/psc - -name=sc NAME=SC LIBDIR=/usr/lib${LIBDIRSUFFIX}/sc sh torev sc.doc > sc.1 -name=sc NAME=SC LIBDIR=/usr/lib${LIBDIRSUFFIX}/sc sh torev psc.doc > psc.1 -cat sc.1 | gzip -9c > $PKG/usr/man/man1/sc.1.gz -cat psc.1 | gzip -9c > $PKG/usr/man/man1/psc.1.gz - -mkdir -p $PKG/usr/doc/sc-$VERSION -cp -a CHANGES README TODO SC.MACROS $PKG/usr/doc/sc-$VERSION -chmod 644 $PKG/usr/doc/sc-$VERSION/* -cat tutorial.sc > $PKG/usr/lib${LIBDIRSUFFIX}/sc/tutorial.sc - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/sc-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/sc/slack-desc b/source/ap/sc/slack-desc deleted file mode 100644 index c64ef2f66..000000000 --- a/source/ap/sc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -sc: sc (spreadsheet calculator) -sc: -sc: This is a simple curses-based spreadsheet program. -sc: -sc: -sc: -sc: -sc: -sc: -sc: -sc: -- cgit v1.2.3-65-gdbad