diff -u gcc-3.3-3.3.6ds1/debian/README.Debian gcc-3.3-3.3.6ds1/debian/README.Debian --- gcc-3.3-3.3.6ds1/debian/README.Debian +++ gcc-3.3-3.3.6ds1/debian/README.Debian @@ -110,6 +110,9 @@ fix-siginfo-type: Use siginfo_t instead of struct siginfo on i386. +fix-ucontext-type: + Use ucontext_t instead of struct ucontext on i386/amd64. + fastjar-doc: fastjar.texi: Directly define the gcctabopt and gccoptlist macros. diff -u gcc-3.3-3.3.6ds1/debian/changelog gcc-3.3-3.3.6ds1/debian/changelog --- gcc-3.3-3.3.6ds1/debian/changelog +++ gcc-3.3-3.3.6ds1/debian/changelog @@ -1,3 +1,12 @@ +gcc-3.3 (1:3.3.6ds1-30) unstable; urgency=medium + + * Use ucontext_t instead of struct ucontext. (Closes: #887782) + * Clarify that libstdc++5 is only still around for proprietary + binaries that cannot be recompiled in the package's description. + (Closes: #887783, #855851) + + -- Philipp Kern Sun, 04 Feb 2018 16:11:34 +0100 + gcc-3.3 (1:3.3.6ds1-29) unstable; urgency=medium * Stop build-depending on realpath, as it has been replaced with diff -u gcc-3.3-3.3.6ds1/debian/control gcc-3.3-3.3.6ds1/debian/control --- gcc-3.3-3.3.6ds1/debian/control +++ gcc-3.3-3.3.6ds1/debian/control @@ -19,5 +19,4 @@ . - libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which - was included up to g++-2.95. The first version of libstdc++-v3 appeared - in g++-3.0. + This package contains an old version of libstdc++ intended solely for + compatibility with proprietary binaries that cannot be recompiled. diff -u gcc-3.3-3.3.6ds1/debian/control.m4 gcc-3.3-3.3.6ds1/debian/control.m4 --- gcc-3.3-3.3.6ds1/debian/control.m4 +++ gcc-3.3-3.3.6ds1/debian/control.m4 @@ -28,12 +28,11 @@ Section: devel Priority: PRI(standard) Maintainer: MAINTAINER -Uploaders: Marc 'HE' Brockschmidt Standards-Version: 3.6.2 ifdef(`TARGET',`dnl cross -Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, m4, autoconf2.13, libtool, autotools-dev, gawk, bzip2, dpkg-cross (>= 1.18.1), BINUTILS_BUILD_DEP, debhelper (>= 8.1.3), bison (>= 1:1.875), flex, realpath (>= 1.9.12), lsb-release`'TARGETBD +Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, m4, autoconf2.13, libtool, autotools-dev, gawk, bzip2, dpkg-cross (>= 1.18.1), BINUTILS_BUILD_DEP, debhelper (>= 8.1.3), bison (>= 1:1.875), flex, lsb-release`'TARGETBD ',`dnl native -Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], debhelper (>= 8.1.3), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], locales [locale_no_archs !hurd-i386], procps [check_no_archs], sharutils, realpath (>= 1.9.12), lsb-release +Build-Depends: dpkg-dev (>= 1.16.0), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP libunwind7-dev (>= 0.98.5-1) [ia64], libatomic-ops-dev [ia64], m4, autoconf2.13, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], debhelper (>= 8.1.3), gperf (>= 2.7-3), bison (>= 1:1.875), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], locales [locale_no_archs !hurd-i386], procps [check_no_archs], sharutils, lsb-release Build-Depends-Indep: doxygen (>= 1.4.2-3), graphviz (>= 2.2), gsfonts-x11 ')dnl @@ -436,9 +435,8 @@ This package contains an additional runtime library for C++ programs built with the GNU compiler. . - libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which - was included up to g++-2.95. The first version of libstdc++-v3 appeared - in g++-3.0. + This package contains an old version of libstdc++ intended solely for + compatibility with proprietary binaries that cannot be recompiled. ifdef(`TARGET', `dnl . This package contains files for TARGET architecture, for use in cross-compile diff -u gcc-3.3-3.3.6ds1/debian/rules.parameters gcc-3.3-3.3.6ds1/debian/rules.parameters --- gcc-3.3-3.3.6ds1/debian/rules.parameters +++ gcc-3.3-3.3.6ds1/debian/rules.parameters @@ -1,10 +1,10 @@ # configuration parameters taken from upstream source files VER := 3.3.6 BASE_VERSION := 3.3 -SOURCE_VERSION := 1:3.3.6ds1-27.2 -DEB_VERSION := 1:3.3.6-27.2 +SOURCE_VERSION := 1:3.3.6ds1-30 +DEB_VERSION := 1:3.3.6-30 GPC_BASE_VERSION := 2.1 -DEB_GPC_VERSION := 2:3.3.6.-27.2 +DEB_GPC_VERSION := 2:3.3.6.-30 DEB_SOVERSION := 1:3.3.4-1 DEB_FFI_SOVERSION := 1:3.3.4-1 DEB_GCC_SOVERSION := 1:3.3.4-3 diff -u gcc-3.3-3.3.6ds1/debian/rules.patch gcc-3.3-3.3.6ds1/debian/rules.patch --- gcc-3.3-3.3.6ds1/debian/rules.patch +++ gcc-3.3-3.3.6ds1/debian/rules.patch @@ -40,6 +40,7 @@ gcc-mips-update \ collect2-open \ fix-siginfo-type \ + fix-ucontext-type \ ifeq ($(GFDL_INVARIANT_FREE),yes) debian_patches += \ only in patch2: unchanged: --- gcc-3.3-3.3.6ds1.orig/debian/patches/fix-ucontext-type.dpatch +++ gcc-3.3-3.3.6ds1/debian/patches/fix-ucontext-type.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh -e + +# DP: Use ucontext_t instead of struct ucontext on i386/amd64. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- gcc/config/i386/linux64.h.orig 2018-02-04 15:09:50.527970610 +0100 ++++ gcc/config/i386/linux64.h 2018-02-04 15:10:04.611929680 +0100 +@@ -112,7 +112,7 @@ + if (*(unsigned char *)(pc_+0) == 0x48 \ + && *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7) \ + { \ +- struct ucontext *uc_ = (CONTEXT)->cfa; \ ++ ucontext_t *uc_ = (CONTEXT)->cfa; \ + sc_ = (struct sigcontext *) &uc_->uc_mcontext; \ + } \ + else \ +@@ -182,7 +182,7 @@ + struct siginfo *pinfo; \ + void *puc; \ + struct siginfo info; \ +- struct ucontext uc; \ ++ ucontext_t uc; \ + } *rt_ = (CONTEXT)->cfa; \ + sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ + } \ +--- gcc/config/i386/linux.h.orig 2018-02-04 15:08:47.356154428 +0100 ++++ gcc/config/i386/linux.h 2018-02-04 15:10:39.683827835 +0100 +@@ -260,7 +260,7 @@ + siginfo_t *pinfo; \ + void *puc; \ + siginfo_t info; \ +- struct ucontext uc; \ ++ ucontext_t uc; \ + } *rt_ = (CONTEXT)->cfa; \ + sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ + } \