diff -Nru gauche-0.9.10/debian/changelog gauche-0.9.10/debian/changelog --- gauche-0.9.10/debian/changelog 2020-12-18 07:11:10.000000000 +0000 +++ gauche-0.9.10/debian/changelog 2020-12-23 04:46:09.000000000 +0000 @@ -1,3 +1,24 @@ +gauche (0.9.10-3) unstable; urgency=medium + + * debian/patches/46_ctermid.patch: New. Fixes FTBFS for mipsel. + * debian/patches/47_ctermid_c.patch: New. + * debian/patches/series: Update. + + -- NIIBE Yutaka Wed, 23 Dec 2020 13:46:09 +0900 + +gauche (0.9.10-2) unstable; urgency=medium + + * debian/patches/28_test_under_pty.patch: Remove. + * debian/patches/series: Update. + * debian/compat: Upgrade to 13. + * debian/libgauche-0.97-0.symbols: Update. + (Build-Depends-Package): Add. + * debian/control (Build-Depends): Require newer debhelper. + (Standards-Version): Conforms to 4.5.1. + (Rules-Requires-Root): Add. + + -- NIIBE Yutaka Mon, 21 Dec 2020 10:47:20 +0900 + gauche (0.9.10-1) unstable; urgency=medium [ Jens Thiele ] @@ -823,7 +844,7 @@ * New upstream release * Now, 'make distclean' removes config.log closes: Bug#184900 * applied a patch sent from Goran Weinholt. thanks. closes: Bug#176571 - * config.guess and config.sub are copied from autotools-dev pkg. closes: Bug#168517 + * config.guess and config.sub are copied from autotools-dev pkg. closes: Bug#168517 * made gauche use system libgc closes: Bug#174212 * thank for Mark Brown's patch files. @@ -856,7 +877,7 @@ gauche (0.6.3-2) unstable; urgency=low - * fixed typo in debian/control. + * fixed typo in debian/control. * configure with --with-slib and --enable-threads=posix. * added recommends: slib. * made generated source files in ext/uvector removed when distclean. @@ -934,7 +955,7 @@ gauche (0.3-1) unstable; urgency=low - * Initial Release. + * Initial Release. -- Hatta Shuzo Fri, 6 Apr 2001 15:55:57 +0900 diff -Nru gauche-0.9.10/debian/compat gauche-0.9.10/debian/compat --- gauche-0.9.10/debian/compat 2020-12-17 03:46:18.000000000 +0000 +++ gauche-0.9.10/debian/compat 2020-12-23 01:29:59.000000000 +0000 @@ -1 +1 @@ -11 +13 diff -Nru gauche-0.9.10/debian/control gauche-0.9.10/debian/control --- gauche-0.9.10/debian/control 2020-12-17 07:23:17.000000000 +0000 +++ gauche-0.9.10/debian/control 2020-12-23 01:29:59.000000000 +0000 @@ -3,11 +3,12 @@ Priority: optional Maintainer: NIIBE Yutaka Uploaders: YAEGASHI Takeshi , Jens Thiele -Build-Depends: debhelper (>= 11), libgdbm-dev (>= 1.18), libtool, pkg-config, slib (>> 3a5), zlib1g-dev, netbase, texinfo, openssl, libmbedtls-dev -Standards-Version: 4.2.1 +Build-Depends: debhelper (>= 13~), libgdbm-dev (>= 1.18), libtool, pkg-config, slib (>> 3a5), zlib1g-dev, netbase, texinfo, openssl, libmbedtls-dev +Standards-Version: 4.5.1 Homepage: http://practical-scheme.net/gauche/ Vcs-Git: https://salsa.debian.org/debian/gauche.git Vcs-Browser: https://salsa.debian.org/debian/gauche +Rules-Requires-Root: binary-targets Package: gauche Architecture: any @@ -56,7 +57,6 @@ This package contains zlib binding modules for Gauche. Package: gauche-dev -Section: lisp Architecture: any Depends: gauche (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Development files for Gauche diff -Nru gauche-0.9.10/debian/libgauche-0.97-0.symbols gauche-0.9.10/debian/libgauche-0.97-0.symbols --- gauche-0.9.10/debian/libgauche-0.97-0.symbols 2020-12-17 07:24:37.000000000 +0000 +++ gauche-0.9.10/debian/libgauche-0.97-0.symbols 2020-12-23 01:29:59.000000000 +0000 @@ -1,4 +1,5 @@ libgauche-0.97.so.0 libgauche-0.97-0 #MINVER# +* Build-Depends-Package: gauche-dev Scm_AbandonedMutexExceptionClass@Base 0.9 Scm_Abort@Base 0.9 Scm_Abs@Base 0.9 @@ -1328,11 +1329,11 @@ Scm__VMInsnOffsets@Base 0.9.5 (arch=arm armel armhf)check_armendian@Base 0.9 # Symbols from libgc - (arch=armel armhf sh4|optional)AO_compare_double_and_swap_double_emulation@Base 0.9.3 - (arch=armel armhf sh4|optional)AO_fetch_compare_and_swap_emulation@Base 0.9.3 - (arch=armel armhf sh4|optional)AO_pause@Base 0.9.6 - (arch=armel armhf sh4|optional)AO_pt_lock@Base 0.9.3 - (arch=armel armhf sh4|optional)AO_store_full_emulation@Base 0.9.3 +#(arch=armel armhf sh4|optional)AO_compare_double_and_swap_double_emulation@Base 0.9.3 #missing 0.9.10 +#(arch=armel armhf sh4|optional)AO_fetch_compare_and_swap_emulation@Base 0.9.3 #missing 0.9.10 +#(arch=armel armhf sh4|optional)AO_pause@Base 0.9.6 #missing 0.9.10 +#(arch=armel armhf sh4|optional)AO_pt_lock@Base 0.9.3 #missing 0.9.10 +#(arch=armel armhf sh4|optional)AO_store_full_emulation@Base 0.9.3 #missing 0.9.10 #(optional)GC_FirstDLOpenedLinkMap@Base 0.9.3 #missing 0.9.10 #(optional)GC_abort@Base 0.9 #missing 0.9.4 #(optional)GC_add_ext_descriptor@Base 0.9 #missing 0.9.5 @@ -1566,7 +1567,7 @@ (optional)GC_get_max_retries@Base 0.9.3 (optional)GC_get_no_dls@Base 0.9.3 (optional)GC_get_non_gc_bytes@Base 0.9.3 - (arch=armhf armel|optional)GC_get_nprocs_present@Base 0.9.3 +#(arch=armhf armel|optional)GC_get_nprocs_present@Base 0.9.3 #missing 0.9.10 (optional)GC_get_on_heap_resize@Base 0.9.4 (optional)GC_get_oom_fn@Base 0.9.3 (optional)GC_get_pages_executable@Base 0.9.3 @@ -2008,7 +2009,7 @@ (optional)GC_stop_world_external@Base 0.9.10 #(optional)free_list_index_of@Base 0.9 #missing 0.9.3 #THREAD_LOCAL_ALLOC - (arch=m68k arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_allocate_lock@Base 0.9.6 +#(arch=m68k arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_allocate_lock@Base 0.9.6 #missing 0.9.10 #(arch=!m68k !arm64 !s390x !mips !armel !hppa !mips64el !armhf !mipsel !alpha|optional)GC_allocate_ml@Base 0.9 #missing 0.9.10 #(optional)GC_block_count@Base 0.9 #missing 0.9.3 #(optional)GC_core_gcj_malloc@Base 0.9 #missing 0.9.5 @@ -2033,9 +2034,10 @@ (arch=ia64 sparc sparc64|optional)GC_save_regs_ret_val@Base 0.9 (arch=sparc sparc64|optional)GC_SysVGetDataStart@Base 0.9 (arch=sparc sparc64|optional)_etext@Base 0.9 + (arch=kfreebsd-amd64 kfreebsd-i386|optional)etext@Base 0.9 + (arch=riscv64|optional)end@Base 0.9.10 (arch=kfreebsd-amd64 kfreebsd-i386|optional)GC_FreeBSDGetDataStart@Base 0.9 (arch=kfreebsd-amd64 kfreebsd-i386|optional)GC_freebsd_main_stack_base@Base 0.9.3 - (arch=kfreebsd-amd64 kfreebsd-i386|optional)etext@Base 0.9 #(arch=armel armhf hurd-i386|optional)GC_key_create@Base 0.9 #missing 0.9.4 #(arch=armel armhf hurd-i386|optional)GC_remove_specific@Base 0.9 #missing 0.9.4 #(arch=armel armhf hurd-i386|optional)GC_setspecific@Base 0.9 #missing 0.9.4 @@ -2105,6 +2107,6 @@ #(arch=!kfreebsd-amd64 !kfreebsd-i386 !m68k !arm64 !s390x !mips !armel !hppa !mips64el !armhf !mipsel !alpha|optional)GC_start_mark_threads_inner@Base 0.9.5 #missing 0.9.10 #(arch=!kfreebsd-amd64 !kfreebsd-i386 !m68k !arm64 !s390x !mips !armel !hppa !mips64el !armhf !mipsel !alpha|optional)GC_wait_for_markers_init@Base 0.9.5 #missing 0.9.10 # kfreebsd-amd64 kfreebsd-i386 - (arch=kfreebsd-amd64 kfreebsd-i386 m68k arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked1@Base 0.9 #missing 0.9.4 - (arch=kfreebsd-amd64 kfreebsd-i386 arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked2@Base 0.9 #missing 0.9.4 - (arch=kfreebsd-amd64 kfreebsd-i386 arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked4@Base 0.9 #missing 0.9.4 +#(arch=kfreebsd-amd64 kfreebsd-i386 m68k arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked1@Base 0.9 #missing 0.9.4 +#(arch=kfreebsd-amd64 kfreebsd-i386 arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked2@Base 0.9 #missing 0.9.4 +#(arch=kfreebsd-amd64 kfreebsd-i386 arm64 s390x mips armel hppa mips64el armhf mipsel alpha|optional)GC_push_marked4@Base 0.9 #missing 0.9.4 diff -Nru gauche-0.9.10/debian/patches/28_test_under_pty.patch gauche-0.9.10/debian/patches/28_test_under_pty.patch --- gauche-0.9.10/debian/patches/28_test_under_pty.patch 2020-12-18 05:33:33.000000000 +0000 +++ gauche-0.9.10/debian/patches/28_test_under_pty.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -Description: test under pty so that it can run on buildd -Author: NIIBE Yutaka -Last-Update: 2020-12-18 - -Index: gauche/ext/termios/Makefile.in -=================================================================== ---- gauche.orig/ext/termios/Makefile.in -+++ gauche/ext/termios/Makefile.in -@@ -4,6 +4,11 @@ top_srcdir = @top_srcdir@ - - include ../Makefile.ext - -+# Override the rule for check -+check : all -+ @rm -f test.log -+ GAUCHE_TEST_RECORD_FILE=$(TESTRECORD) $(GOSH) -I"$(srcdir)" -I. "$(srcdir)/test-with-pty.scm" test.log -+ - SCM_CATEGORY = gauche - - LIBFILES = gauche--termios.$(SOEXT) -Index: gauche/ext/termios/test-with-pty.scm -=================================================================== ---- /dev/null -+++ gauche/ext/termios/test-with-pty.scm -@@ -0,0 +1,33 @@ -+;; Run termios test with PTY -+ -+(use gauche.termios) -+(use srfi-0) -+(use srfi-11) -+(use srfi-193) -+ -+(cond-expand -+ [(not gauche.os.windows) -+ (let-values (((pid fd) (sys-forkpty))) -+ (if (= pid 0) -+ (let* ((output-filename (last (command-args))) -+ (redirected-output-port (open-output-file output-filename))) -+ (port-fd-dup! (standard-output-port) redirected-output-port) -+ (close-port redirected-output-port) -+ (sys-exec "../../src/gosh" -+ '("../../src/gosh" "-ftest" "-I." "test.scm"))) -+ (let ((port (open-input-fd-port fd))) -+ (let loop ((line (read-line port))) -+ (cond ((eof-object? line) -+ (close-input-port port) -+ (sys-wait)) -+ (else -+ (display line (current-error-port)) -+ (newline (current-error-port)) -+ (loop -+ (guard (e (else (eof-object))) -+ (read-line port))))))))) -+ ] -+ [else -+ ;; -+ ;; -+ ]) diff -Nru gauche-0.9.10/debian/patches/46_ctermid.patch gauche-0.9.10/debian/patches/46_ctermid.patch --- gauche-0.9.10/debian/patches/46_ctermid.patch 1970-01-01 00:00:00.000000000 +0000 +++ gauche-0.9.10/debian/patches/46_ctermid.patch 2020-12-23 04:43:03.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Fix sys-ctermid implementation + It may results compiler dependent behavior, because of out of scope 'buf'. +Forwarded: Not-Yet +Author: NIIBE Yutaka +Last-Update: 2020-12-22 + +Index: gauche/src/libsys.scm +=================================================================== +--- gauche.orig/src/libsys.scm ++++ gauche/src/libsys.scm +@@ -463,8 +463,7 @@ + (define-cproc sys-ctermid () :: + (.if "defined(GAUCHE_WINDOWS)" + (return "CON") +- (let* ([buf::(.array char [(+ L_ctermid 1)])]) +- (return (ctermid buf))))) ++ (return (ctermid NULL)))) + + ;;--------------------------------------------------------------------- + ;; stdlib.h diff -Nru gauche-0.9.10/debian/patches/47_ctermid_c.patch gauche-0.9.10/debian/patches/47_ctermid_c.patch --- gauche-0.9.10/debian/patches/47_ctermid_c.patch 1970-01-01 00:00:00.000000000 +0000 +++ gauche-0.9.10/debian/patches/47_ctermid_c.patch 2020-12-23 04:46:09.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Fix sys-ctermid implementation in C + It may results compiler dependent behavior, because of out of scope 'buf'. +Forwarded: Not-Yet +Author: NIIBE Yutaka +Last-Update: 2020-12-22 + +Index: gauche/src/libsys.c +=================================================================== +--- gauche.orig/src/libsys.c ++++ gauche/src/libsys.c +@@ -5710,8 +5710,7 @@ const char * SCM_RESULT; + #else /* !defined(GAUCHE_WINDOWS) */ + + #line 466 "libsys.scm" +-{char buf[(L_ctermid)+(1)]; +-{SCM_RESULT=(ctermid(buf));goto SCM_STUB_RETURN;}} ++{SCM_RESULT=(ctermid(NULL));goto SCM_STUB_RETURN;} + #endif /* defined(GAUCHE_WINDOWS) */ + + goto SCM_STUB_RETURN; diff -Nru gauche-0.9.10/debian/patches/series gauche-0.9.10/debian/patches/series --- gauche-0.9.10/debian/patches/series 2020-12-18 00:15:30.000000000 +0000 +++ gauche-0.9.10/debian/patches/series 2020-12-23 04:46:09.000000000 +0000 @@ -1,3 +1,4 @@ +46_ctermid.patch 34_alpha_stackbottom.patch 44_endian_not_asm_byteorder_h.patch 42_hppa_libatomic_ops.patch @@ -9,7 +10,6 @@ 20_check_exit_status.patch 23_sh4_requires_mieee.patch 26_no_microversion_in_soname.patch -28_test_under_pty.patch 30_link_pthread.patch 31_ldflags_for_ext.patch # 35_axtls_error.patch @@ -17,3 +17,4 @@ 40_tls_test_localhost.patch # 41_link_libatomic.patch 42_cflags_reproducible.patch +47_ctermid_c.patch