diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-02-23 03:33:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-02-23 08:59:46 +0100 |
commit | e4e2151ae8891f9d3209943ce57106e8edc910ac (patch) | |
tree | 182487719a1417a51fabc4e05093ce5d7ae12869 /source/d | |
parent | 9ee3947a2be8da2226474c69fe1c24cf8c1605e7 (diff) | |
download | current-e4e2151ae8891f9d3209943ce57106e8edc910ac.tar.gz current-e4e2151ae8891f9d3209943ce57106e8edc910ac.tar.xz |
Sat Feb 23 03:33:52 UTC 201920190223033352
a/file-5.36-x86_64-1.txz: Upgraded.
ap/mariadb-10.3.13-x86_64-1.txz: Upgraded.
This update fixes bugs and security issues.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2510
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2537
(* Security fix *)
d/p2c-2.01-x86_64-1.txz: Upgraded.
d/python-pip-19.0.3-x86_64-1.txz: Upgraded.
l/librsvg-2.44.13-x86_64-2.txz: Rebuilt.
Recompiled with --enable-vala=yes.
n/bind-9.12.3_P4-x86_64-1.txz: Upgraded.
xap/mozilla-firefox-60.5.2esr-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/firefox/60.5.2/releasenotes/
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/p2c/_p2c/usr/bin/p2c | 0 | ||||
-rwxr-xr-x | source/d/p2c/_p2c/usr/bin/p2cc | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/include/p2c/p2c.h | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/libp2c.a | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/loc.p2crc | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/p2crc | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/string.pas | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/system.imp | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/system.m2 | 0 | ||||
-rw-r--r-- | source/d/p2c/_p2c/usr/lib/p2c/turbo.imp | 0 | ||||
-rwxr-xr-x | source/d/p2c/p2c.SlackBuild | 68 | ||||
-rw-r--r-- | source/d/p2c/p2c.examples.diff | 15 | ||||
-rw-r--r-- | source/d/p2c/p2c.getline.diff | 118 | ||||
-rw-r--r-- | source/d/p2c/p2c.url | 1 | ||||
-rw-r--r-- | source/d/p2c/p2c_1.21alpha2-2.1.diff | 320 | ||||
-rw-r--r-- | source/d/p2c/p2c_time.diff | 10 | ||||
-rwxr-xr-x | source/d/python-pip/python-pip.SlackBuild | 2 |
17 files changed, 39 insertions, 495 deletions
diff --git a/source/d/p2c/_p2c/usr/bin/p2c b/source/d/p2c/_p2c/usr/bin/p2c deleted file mode 100755 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/bin/p2c +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/bin/p2cc b/source/d/p2c/_p2c/usr/bin/p2cc deleted file mode 100755 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/bin/p2cc +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/include/p2c/p2c.h b/source/d/p2c/_p2c/usr/include/p2c/p2c.h deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/include/p2c/p2c.h +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/libp2c.a b/source/d/p2c/_p2c/usr/lib/libp2c.a deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/libp2c.a +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/loc.p2crc b/source/d/p2c/_p2c/usr/lib/p2c/loc.p2crc deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/loc.p2crc +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/p2crc b/source/d/p2c/_p2c/usr/lib/p2c/p2crc deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/p2crc +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/string.pas b/source/d/p2c/_p2c/usr/lib/p2c/string.pas deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/string.pas +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/system.imp b/source/d/p2c/_p2c/usr/lib/p2c/system.imp deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/system.imp +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/system.m2 b/source/d/p2c/_p2c/usr/lib/p2c/system.m2 deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/system.m2 +++ /dev/null diff --git a/source/d/p2c/_p2c/usr/lib/p2c/turbo.imp b/source/d/p2c/_p2c/usr/lib/p2c/turbo.imp deleted file mode 100644 index e69de29bb..000000000 --- a/source/d/p2c/_p2c/usr/lib/p2c/turbo.imp +++ /dev/null diff --git a/source/d/p2c/p2c.SlackBuild b/source/d/p2c/p2c.SlackBuild index c2d352cbc..79bf1d615 100755 --- a/source/d/p2c/p2c.SlackBuild +++ b/source/d/p2c/p2c.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,16 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Sources: -# ftp://ftp.pal.xgw.fi/pub/gnu/alpha/gnu/p2c-1.21alpha2.tar.gz -# ftp://ftp.clara.net/pub/mirrors/gnu/hurd/p2c-1.21alpha2.tar.gz -# ftp://ftp.obspm.fr/pub1/computing/gnu/hurd/p2c-1.21alpha2.tar.gz - cd $(dirname $0) ; CWD=$(pwd) PKGNAM=p2c -VERSION=${VERSION:-1.21alpha2} -BUILD=${BUILD:-4} +VERSION=${VERSION:-2.01} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -71,14 +66,10 @@ PKG=$TMP/package-p2c rm -rf $PKG mkdir -p $TMP $PKG -# Explode the package framework: -cd $PKG -explodepkg $CWD/_p2c.tar.gz - cd $TMP -rm -rf p2c-1.21alpha-07.Dec.93 -tar xvf $CWD/p2c-1.21alpha2.tar.gz || exit 1 -cd p2c-1.21alpha-07.Dec.93 || exit 1 +rm -rf p2c-${VERSION} +tar xvf $CWD/p2c-${VERSION}.tar.?z || exit 1 +cd p2c-${VERSION} || exit 1 chown -R root:root . find . \ @@ -87,11 +78,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/p2c_1.21alpha2-2.1.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/p2c_time.diff.gz | patch -p0 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/p2c.getline.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - find . -name "*.orig" | xargs rm --verbose + # Fix library paths: sed -i -e "s#/lib #/lib${LIBDIRSUFFIX} #g" \ -e "s#/lib\$#/lib${LIBDIRSUFFIX}#g" \ @@ -99,12 +87,30 @@ sed -i -e "s#/lib #/lib${LIBDIRSUFFIX} #g" \ $( grep -lr '/lib' * ) cd src + +# Add includes to get rid of some warnings: +sed -e '/^#include <stdio.h>/ a #include <stdlib.h>' -i 'makeproto.c' +# expose conflicting declarations: +sed -e '/^#include "trans.h"/ i #include <unistd.h>' -i 'trans.c' +# Switch to built in link,unlink declarations: +sed -e '/^int u*n*link / s:^.*$:/* & */:g' -i 'trans.h' + +# Switch from private to public build: +sed -e '/private version/,/^$/ s:^[A-Z]:#&:g' \ + -e '/public version/,/^$/ s:^#\([A-Z]\):\1:g' \ + -i 'Makefile' + make OPT="$SLKCFLAGS" || exit 1 make p2cc || exit 1 -mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} 2>/dev/null +mkdir -p $PKG/usr/bin +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/p2c +mkdir -p $PKG/usr/include/p2c +mkdir -p $PKG/usr/man/man1 + cat p2c > $PKG/usr/bin/p2c cat p2cc > $PKG/usr/bin/p2cc +chmod 755 $PKG/usr/bin/* cat libp2c.a > $PKG/usr/lib${LIBDIRSUFFIX}/libp2c.a cat p2c.man | gzip -9c > $PKG/usr/man/man1/p2c.1.gz cat p2cc.man | gzip -9c > $PKG/usr/man/man1/p2cc.1.gz @@ -120,22 +126,23 @@ cd .. 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/usr/doc/p2c-1.21alpha2 +mkdir -p $PKG/usr/doc/p2c-${VERSION} cp -a \ README ftp.README \ - $PKG/usr/doc/p2c-1.21alpha2 + $PKG/usr/doc/p2c-${VERSION} ( cd src for file in HISTORY NOTES COPYING INSTALL ; do - cp -a $file $PKG/usr/doc/p2c-1.21alpha2 + cp -a $file $PKG/usr/doc/p2c-${VERSION} done ) -cp -a src/README $PKG/usr/doc/p2c-1.21alpha2/README.src -cp -a examples $PKG/usr/doc/p2c-1.21alpha2 -( cd $PKG/usr/doc/p2c-1.21alpha2 - zcat $CWD/p2c.examples.diff.gz | patch -p1 --verbose || exit 1 -) || exit 1 -rm -f $PKG/usr/doc/p2c-1.21alpha2/examples/Makefile~ -rm -rf $PKG/usr/doc/p2c-1.21alpha2/examples/c +cp -a src/README $PKG/usr/doc/p2c-${VERSION}/README.src +cp -a examples $PKG/usr/doc/p2c-${VERSION} +# Fix examples Makefile: +sed -i "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" $PKG/usr/doc/p2c-${VERSION}/examples/Makefile +sed -i "s#../p2c#p2c#g" $PKG/usr/doc/p2c-${VERSION}/examples/Makefile +sed -i "s#../home/libp2c.a#/usr/lib${LIBDIRSUFFIX}/libp2c.a#g" $PKG/usr/doc/p2c-${VERSION}/examples/Makefile +sed -i "s#../home#/usr/include/p2c#g" $PKG/usr/doc/p2c-${VERSION}/examples/Makefile +chmod 755 $PKG/usr/doc/p2c-${VERSION}/examples mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -143,4 +150,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/p2c-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/d/p2c/p2c.examples.diff b/source/d/p2c/p2c.examples.diff deleted file mode 100644 index 2a66af55b..000000000 --- a/source/d/p2c/p2c.examples.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./examples/Makefile.orig 1993-12-07 23:36:58.000000000 -0600 -+++ ./examples/Makefile 2007-06-02 12:53:13.000000000 -0500 -@@ -4,9 +4,9 @@ - - # The following definitions assume p2c has been compiled into the "home" - # directory as shown in src/Makefile. --P2C = ../p2c --INC = ../home --LIB = ../home/libp2c.a -+P2C = p2c -+INC = /usr/include/p2c -+LIB = /usr/lib/libp2c.a - - - default: comp diff --git a/source/d/p2c/p2c.getline.diff b/source/d/p2c/p2c.getline.diff deleted file mode 100644 index 25df12c15..000000000 --- a/source/d/p2c/p2c.getline.diff +++ /dev/null @@ -1,118 +0,0 @@ ---- ./src/lex.c.orig 1993-12-07 23:36:49.000000000 -0600 -+++ ./src/lex.c 2018-02-01 15:27:54.224877642 -0600 -@@ -1044,7 +1044,7 @@ - - - --void getline() -+void p2c_getline() - { - char *cp, *cp2; - -@@ -1071,7 +1071,7 @@ - infname = stralloc(cp); - infname[cp2 - cp] = 0; - } -- getline(); -+ p2c_getline(); - return; - } - if (copysource && *inbuf) { -@@ -1088,7 +1088,7 @@ - fprintf(stderr, "\n"); - if (inputkind == INP_INCFILE) { - pop_input(); -- getline(); -+ p2c_getline(); - } else - strcpy(inbuf, "\001"); - } -@@ -1179,7 +1179,7 @@ - infname = fname; - inf_lnum = 0; - } else -- inf_lnum--; /* adjust for extra getline() */ -+ inf_lnum--; /* adjust for extra p2c_getline() */ - *inbuf = 0; - inbufptr = inbuf; - gettok(); -@@ -2367,7 +2367,7 @@ - else - commentline(CMT_POST); - trailing = 0; -- getline(); -+ p2c_getline(); - i = 0; - for (;;) { - if (*inbufptr == ' ') { -@@ -2419,7 +2419,7 @@ - if (isspace(*inbufptr)) { - inbufptr++; - } else if (!*inbufptr) { -- getline(); -+ p2c_getline(); - } else if (*inbufptr == '{') { - inbufptr++; - comment(0); -@@ -2513,7 +2513,7 @@ - switch (*inbufptr++) { - - case 0: -- getline(); -+ p2c_getline(); - break; - - case ' ': -@@ -2765,7 +2765,7 @@ - case 0: - if (commenting_flag) - saveinputcomment(inbufptr-1); -- getline(); -+ p2c_getline(); - cp = curtokbuf; - for (;;) { - inbufindent = 0; -@@ -2782,7 +2782,7 @@ - } - if (!*inbufptr && !commenting_flag) { /* blank line */ - *cp++ = '\001'; -- getline(); -+ p2c_getline(); - } else - break; - } -@@ -2797,10 +2797,10 @@ - *cp++ = '\001'; - *cp++ = '\014'; - if (!*inbufptr && !commenting_flag) { -- getline(); -+ p2c_getline(); - while (!*inbufptr) { - *cp++ = '\001'; -- getline(); -+ p2c_getline(); - } - } - *cp = 0; ---- ./src/parse.c.orig 2018-02-01 15:25:56.206878896 -0600 -+++ ./src/parse.c 2018-02-01 15:28:00.997877570 -0600 -@@ -5073,7 +5073,7 @@ - out_include(fname, 1); - outsection(majorspace); - pop_input(); -- getline(); -+ p2c_getline(); - gettok(); - } - ---- ./src/TAGS.orig 1993-12-07 23:36:55.000000000 -0600 -+++ ./src/TAGS 2018-02-01 15:27:50.927877677 -0600 -@@ -176,7 +176,7 @@ - char getchartok(2466,60243 - Static int getflag(2451,60064 - char *getinlinepart(2414,59241 --void getline(1047,22000 -+void p2c_getline(1047,22000 - char *getparenstr(2481,60499 - void gettok(2728,65611 - void gettok(2752,66193 diff --git a/source/d/p2c/p2c.url b/source/d/p2c/p2c.url new file mode 100644 index 000000000..284164fb0 --- /dev/null +++ b/source/d/p2c/p2c.url @@ -0,0 +1 @@ +https://alum.mit.edu/www/toms/p2c/p2c-2.01.tar.gz diff --git a/source/d/p2c/p2c_1.21alpha2-2.1.diff b/source/d/p2c/p2c_1.21alpha2-2.1.diff deleted file mode 100644 index b7fbaf007..000000000 --- a/source/d/p2c/p2c_1.21alpha2-2.1.diff +++ /dev/null @@ -1,320 +0,0 @@ ---- p2c-1.21alpha2.orig/debian/README.Debian -+++ p2c-1.21alpha2/debian/README.Debian -@@ -0,0 +1,54 @@ -+p2c for Debian -+-------------- -+ -+You should be aware that p2c is not perfect in converting Pascal sources -+to C, and it won't make the best C code. -+ -+Also if you notice that your translated C program won't compile because -+of an undefined reference to PASCAL_MAIN function, just comment that line -+from the C file and it should work. -+ -+Here are some words from src/INSTALL file that could be of some use: -+ -++++ -+ -+ Incomplete interface texts for standard Turbo units are included in -+ turbo.imp. Turbo users will have to flesh these out and write emulations -+ for whatever parts of the Turbo runtime library they need. -+ -+ If you wish to edit various system-wide configuration parameters, it is -+ better to put them in loc.p2crc than in sys.p2crc. As an example, on a -+ Turbo-oriented environment you may wish to add -+ -+ Language Turbo -+ -+ to the loc.p2crc file to replace the normal default (HP Pascal). -+ -+ PORTABILITY -+ -+ P2c was originally developed on a homebrew C compiler on the HP Pascal -+ Workstation operating system. Current development takes place on HP-UX, -+ which is System V based. The translator has also been compiled and used -+ on Sun-3's, so presumably it is fairly portable among 32-bit Unix machines. -+ -+ Many parts of the code will have to be adjusted in order for p2c to work -+ on a machine with 16-bit ints. I have never had reason or opportunity to -+ track these down since I don't have access to such a machine. Please note -+ that code _generated_ by p2c works with either size of int even though p2c -+ itself does not. -+ -+ If your compiler supports ANSI prototypes, most of the 16-bit portability -+ problems will go away except for possible %d/%ld sloppiness in sprintf control -+ strings. There may be places where p2c tries to cast a pointer into an -+ int, but I believe all such cases use longs consistently. You will have -+ a problem if your long type is not large enough to store a pointer. -+ -+ Because p2c was developed to run under Unix, it is sloppy about memory -+ allocation. Some data structures are allocated but never freed. Profiles -+ show that the waste is not too great in most cases, but if it is a problem -+ you may have to write a garbage collector (this shouldn't be too hard if you -+ only run the collector after translating each procedure). -+ -++++ -+ -+ -- Josip Rodin <joy-packages@debian.org>, Mon, 28 Dec 1998 18:14:23 +0100 ---- p2c-1.21alpha2.orig/debian/rules -+++ p2c-1.21alpha2/debian/rules -@@ -0,0 +1,46 @@ -+#!/usr/bin/make -f -+# Derived from a dh_make example and Andrew Howell's rules file. -+ -+#export DH_VERBOSE=1 -+export DH_COMPAT=4 -+ -+CFLAGS := -g -Wall -+ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" "" -+CFLAGS += -O0 -+else -+CFLAGS += -O2 -+endif -+ -+build: src/p2c -+src/p2c: src/p2c.h -+ $(MAKE) -C src OPT="$(CFLAGS)" LFLAGS="-s" -+ -+clean: -+ dh_testdir -+ dh_testroot -+ $(MAKE) -C src clean -+ dh_clean -+ -+binary-indep: -+# No architecture independant packages here. -+ -+binary-arch: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ $(MAKE) -C src install PREFIX="$(CURDIR)/debian/p2c/usr" -+ dh_installdocs src/README src/NOTES -+ dh_installexamples examples/* -+ dh_installchangelogs src/HISTORY -+ dh_link usr/share/man/man1/p2c.1.gz usr/share/man/man1/p2cc.1.gz -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary ---- p2c-1.21alpha2.orig/debian/control -+++ p2c-1.21alpha2/debian/control -@@ -0,0 +1,26 @@ -+Source: p2c -+Section: devel -+Priority: optional -+Maintainer: Josip Rodin <joy-packages@debian.org> -+Build-Depends: debhelper (>= 4) -+Standards-Version: 3.6.0 -+ -+Package: p2c -+Architecture: any -+Depends: ${shlibs:Depends} -+Suggests: gcc, gpc -+Description: Pascal to C translator -+ P2c is a tool for translating Pascal programs into C. The input -+ consists of a set of source files in any of the following Pascal -+ dialects: HP Pascal, Turbo/UCSD Pascal, DEC VAX Pascal, Oregon Software -+ Pascal/2, Macintosh Programmer's Workshop Pascal, Sun/Berkeley Pascal, -+ Texas Instruments Pascal, Apollo Domain Pascal. Modula-2 syntax is also -+ supported. -+ . -+ Output is a set of .c and .h files that comprise an equivalent program -+ in any of several dialects of C. Output code may be kept machine and -+ dialect-independent, or it may be targeted to a specific machine and -+ compiler. Most reasonable Pascal programs are converted into fully -+ functional C which will compile and run with no further modifications, -+ although p2c sometimes chooses to generate readable code at the expense -+ of absolute generality. ---- p2c-1.21alpha2.orig/debian/copyright -+++ p2c-1.21alpha2/debian/copyright -@@ -0,0 +1,25 @@ -+This package was put together by Andrew Howell. -+The current maintainer is Josip Rodin <joy-packages@debian.org>. -+ -+The original source can be found at: -+ http://www.synaptics.com/people/daveg/ -+ -+p2c's author is Dave Gillespie <daveg@synaptics.com>. -+ -+Copyright 1989-1993 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; version 2 dated June, 1991. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+On Debian systems, the complete text of the GNU General Public License -+can be found in the file /usr/share/common-licenses/GPL. ---- p2c-1.21alpha2.orig/debian/changelog -+++ p2c-1.21alpha2/debian/changelog -@@ -0,0 +1,52 @@ -+p2c (1.21alpha2-2.1) unstable; urgency=low -+ -+ * Non-maintainer upload (0-day) -+ * Applied patch by Peter De Wachter that fixes double memory free()'s -+ (Closes: #305412, #307706) -+ -+ -- Roland Stigge <stigge@antcom.de> Thu, 5 May 2005 16:04:37 +0200 -+ -+p2c (1.21alpha2-2) unstable; urgency=low -+ -+ * Added debhelper to build-depends, closes: #190499. -+ * Updated package standards. -+ -+ -- Josip Rodin <joy-packages@debian.org> Sat, 16 Aug 2003 13:02:10 +0200 -+ -+p2c (1.21alpha2-1) unstable; urgency=low -+ -+ * New upstream version. Although it is marked as "alpha", it has been -+ made in 1993, so... :) (closes: #39400) -+ * Updated for Policy 3.x, rewrote most of debian/* and made a better -+ src/Makefile patch. -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sat, 11 Sep 1999 23:34:19 +0200 -+ -+p2c (1.20-3) unstable; urgency=low -+ -+ * Removed `-m486 -fomit-frame-pointer' from the gcc flags, since ix86 -+ doesn't need it and it bugs m68k (and other ports). -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Thu, 7 Jan 1999 19:01:32 +0100 -+ -+p2c (1.20-2) unstable; urgency=low -+ -+ * Fixed the FSF address in copyright file -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Tue, 29 Dec 1998 21:13:52 +0100 -+ -+p2c (1.20-1) unstable; urgency=low -+ -+ * Initial Release for potato (2.2) -+ * Converted to new packaging format/standards -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Mon, 28 Dec 1998 18:14:23 +0100 -+ -+Changes by Andrew Howell <andrew@it.com.au>: -+ -+1.20-2: -+ 951123 -+ * Converted to ELF. -+ -+1.20-1: -+ * added Debian GNU/Linux package maintenance system files ---- p2c-1.21alpha2.orig/src/Makefile -+++ p2c-1.21alpha2/src/Makefile -@@ -19,22 +19,23 @@ - SHELL = /bin/sh - - # Directories (private version) --HOMEDIR = ../home --INCDIR = ../home/p2c --BINDIR = .. --LIBDIR = ../home --MANDIR = ../home --MANFILE = p2c.cat # human-readable manual (for cat.1) -+#HOMEDIR = ../home -+#INCDIR = ../home/p2c -+#BINDIR = .. -+#LIBDIR = ../home -+#MANDIR = ../home -+#MANFILE = p2c.cat # human-readable manual (for cat.1) - #MANFILE = p2c.man.inst # uncompressed nroff source (for man.1) - #MANFILE = p2c.man.Z # compressed nroff source (for man.1.Z) - - # Directories (public version) --#HOMEDIR = /usr/lib/p2c --#INCDIR = /usr/include/p2c --#BINDIR = /usr/bin --#LIBDIR = /usr/lib --#MANDIR = /usr/man/man1 --#MANFILE = p2c.man.inst -+PREFIX = /usr -+HOMEDIR = $(PREFIX)/lib/p2c -+INCDIR = $(PREFIX)/include/p2c -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/lib -+MANDIR = $(PREFIX)/share/man/man1 -+MANFILE = p2c.man.inst - - # Compiler options - CC = cc # you may wish to use gcc here instead -@@ -64,9 +65,9 @@ - LIBOBJS = p2clib.o loc.p2clib.o - OTHERLIBOBJS = - --ABSHOMEDIR = `cd $(HOMEDIR); pwd` --ABSINCDIR = `cd $(INCDIR); pwd` --ABSLIBDIR = `cd $(LIBDIR); pwd` -+ABSHOMEDIR = /usr/lib/p2c -+ABSINCDIR = /usr/include/p2c -+ABSLIBDIR = /usr/lib - - MISCSRCS = makeproto.c - PROTOS = p2c.proto p2c.hdrs -@@ -161,11 +162,11 @@ - - SHELL=/bin/sh - makedirs: -- if [ ! -d $(HOMEDIR) ]; then mkdir $(HOMEDIR); else true; fi -- if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); else true; fi -- if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); else true; fi -- if [ ! -d $(MANDIR) ]; then mkdir $(MANDIR); else true; fi -- if [ ! -d $(INCDIR) ]; then mkdir $(INCDIR); else true; fi -+ if [ ! -d $(HOMEDIR) ]; then mkdir -p $(HOMEDIR); else true; fi -+ if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); else true; fi -+ if [ ! -d $(LIBDIR) ]; then mkdir -p $(LIBDIR); else true; fi -+ if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); else true; fi -+ if [ ! -d $(INCDIR) ]; then mkdir -p $(INCDIR); else true; fi - - $(BINDIR)/p2c: p2c - $(COPY) p2c $(BINDIR)/p2c -@@ -212,6 +213,7 @@ - - clean: - rm -f $(OBJS) $(LIBOBJS) $(PROTOS) p2c libp2c.a -+ rm -f makeproto p2cc p2c.man.inst p2c.cat - - wc: - wc $(SRCS) $(LIBSRCS) trans.h ---- p2c-1.21alpha2.orig/src/decl.c -+++ p2c-1.21alpha2/src/decl.c -@@ -789,8 +789,10 @@ - mpp2 = &mp2->snext; - if (mp2) - *mpp2 = mp2->snext; -+#if 0 - if (mp->kind == MK_CONST) - free_value(&mp->val); -+#endif - freeexpr(mp->constdefn); - if (mp->cbase) - forget_ctx(mp, 1); ---- p2c-1.21alpha2.orig/src/parse.c -+++ p2c-1.21alpha2/src/parse.c -@@ -4642,8 +4642,10 @@ - } - } - if (conserve_mem) { -+#if 0 - free_stmt((Stmt *)func->val.i); /* is this safe? */ - func->val.i = 0; -+#endif - forget_ctx(func, 0); - } - outsection(spacing); diff --git a/source/d/p2c/p2c_time.diff b/source/d/p2c/p2c_time.diff deleted file mode 100644 index fcd0875de..000000000 --- a/source/d/p2c/p2c_time.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/out.c.orig Fri Feb 22 18:39:33 2002 -+++ ./src/out.c Fri Feb 22 18:41:13 2002 -@@ -41,6 +41,7 @@ - - #if USETIME - # include <sys/time.h> -+# include <time.h> - #else - # include <time.h> - #endif diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild index aa1260ad2..8fb4432e7 100755 --- a/source/d/python-pip/python-pip.SlackBuild +++ b/source/d/python-pip/python-pip.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pip VERSION=${VERSION:-$(echo pip-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=pip |