| /trunk/debian/changelog |
|---|
| 1,12 → 1,3 |
| liboop (1.0.1-1) unstable; urgency=low |
| * New upstream release. |
| * Drop read_bugfixes.patch, configure_support_freebsd_hurd.patch, |
| new-readline-typedef.patch; incorporated upstream. Half of |
| explicit_linking.patch was incorporated upstream. |
| -- Magnus Holmgren <holmgren@debian.org> Tue, 20 Dec 2016 22:43:17 +0100 |
| liboop (1.0-11) unstable; urgency=medium |
| * new-readline-typedef.patch (new): Replace obsolete typedef for |
| /trunk/debian/patches/new-readline-typedef.patch |
|---|
| 0,0 → 1,11 |
| --- a/test-oop.c |
| +++ b/test-oop.c |
| @@ -180,7 +180,7 @@ static void *stop_readline(oop_source *s |
| static void add_readline(oop_source *src) { |
| rl_callback_handler_install( |
| (char *) "> ", /* readline isn't const-correct */ |
| - (VFunction *) on_readline); |
| + (rl_vcpfunc_t *) on_readline); |
| oop_readline_register(src); |
| src->on_signal(src,SIGQUIT,stop_readline,NULL); |
| } |
| /trunk/debian/patches/series |
|---|
| 1,2 → 1,5 |
| read_bugfixes.patch |
| configure_support_freebsd_hurd.patch |
| explicit_linking.patch |
| tcl_dev.patch |
| new-readline-typedef.patch |
| /trunk/debian/patches/tcl_dev.patch |
|---|
| 1,6 → 1,6 |
| --- a/configure |
| +++ b/configure |
| @@ -12666,7 +12666,7 @@ fi |
| @@ -19935,7 +19935,7 @@ |
| fi |
| if test xno != x$with_tcl; then |
| 7,11 → 7,11 |
| - for version in 8.4 8.3 8.2 8.1 8.0 ; do |
| + for version in "" 8.4 8.3 8.2 8.1 8.0 ; do |
| CPPFLAGS="$save_cppflags -I/usr/include/tcl$version" |
| as_ac_Lib=`$as_echo "ac_cv_lib_tcl$version''_Tcl_Main" | $as_tr_sh` |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_Main in -ltcl$version" >&5 |
| as_ac_Lib=`echo "ac_cv_lib_tcl$version''_Tcl_Main" | $as_tr_sh` |
| echo "$as_me:$LINENO: checking for Tcl_Main in -ltcl$version" >&5 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -71,7 +71,7 @@ if test xno != x$with_glib; then |
| @@ -71,7 +71,7 @@ |
| fi |
| if test xno != x$with_tcl; then |
| /trunk/debian/patches/explicit_linking.patch |
|---|
| 1,3 → 1,14 |
| --- a/Makefile.am |
| +++ b/Makefile.am |
| @@ -51,7 +51,7 @@ noinst_PROGRAMS = test-oop |
| test_oop_SOURCES = test-oop.c |
| test_oop_CFLAGS = $(GLIB2_CFLAGS) $(GLIB_INCLUDES) $(TCL_INCLUDES) $(WWW_INCLUDES) |
| -test_oop_LDADD = $(lib_LTLIBRARIES) |
| +test_oop_LDADD = $(lib_LTLIBRARIES) $(GLIB2_LIBS) $(ADNS_LIBS) $(TCL_LIBS) $(READLINE_LIBS) |
| release: dist |
| gzip -dc $(PACKAGE)-$(VERSION).tar.gz | bzip2 -9 \ |
| --- a/liboop-glib2.pc.in |
| +++ b/liboop-glib2.pc.in |
| @@ -7,5 +7,5 @@ Name: liboop-glib2 |
| /trunk/debian/patches/configure_support_freebsd_hurd.patch |
|---|
| 0,0 → 1,17 |
| From: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> |
| Origin: <vendor|upstream|other>, <url of original patch> |
| Bug-Debian: http://bugs.debian.org/359930 |
| Forwarded: no |
| Subject: Make configure.ac recognize BSD and Hurd. |
| --- liboop-1.0.orig/configure.ac |
| +++ liboop-1.0/configure.ac |
| @@ -15,7 +15,7 @@ AC_ARG_WITH(libwww, AC_HELP_STRING(--wit |
| dnl System type checks. |
| case "$host" in |
| - *-linux-*) |
| + *-linux-*|*-k*bsd*|*-gnu*) |
| AC_PATH_PROG(PROG_LDCONFIG, ldconfig, :, $PATH:/usr/sbin:/sbin) |
| no_wacky_libs=yes |
| ;; |
| /trunk/debian/patches/read_bugfixes.patch |
|---|
| 0,0 → 1,40 |
| From: Ian Jackson <ijackson@chiark.greenend.org.uk> |
| Applied-Upstream: no |
| Bug-Debian: http://bugs.debian.org/579604 |
| Subject: oop-read.h bugfixes |
| Some years ago I contributed a feature for reading lines and records |
| to liboop: oop-read.h and read.c. Since it took a while for that |
| feature to make it into distributed versions, for a long time I've |
| been using my own copy of the source file. It seems that I fixed a |
| couple of bugs in my copy which are still in the Debian package. I |
| can't find any record of me having told anyone about them and now I |
| find that 1.0-6 still has the bugs. |
| There are two fixes: |
| * Initialise "rd->discard" properly |
| * Avoid rd->neednotcheck becoming negative |
| --- a/read.c |
| +++ b/read.c |
| @@ -114,6 +114,7 @@ oop_read *oop_rd_new(oop_source *oop, oo |
| rd->allocbuf= 0; |
| rd->used= 0; |
| rd->alloc= buf ? bufsz : 0; |
| + rd->discard= 0; |
| rd->neednotcheck= 0; |
| rd->displacedchar= -1; |
| rd->style= *OOP_RD_STYLE_IMMED; |
| @@ -235,7 +236,11 @@ static void *on_process(oop_source *oop, |
| if (rd->discard) { |
| rd->used -= rd->discard; |
| - rd->neednotcheck -= rd->discard; |
| + if (rd->neednotcheck > rd->discard) { |
| + rd->neednotcheck -= rd->discard; |
| + } else { |
| + rd->neednotcheck= 0; |
| + } |
| memmove(buf, buf + rd->discard, rd->used); |
| rd->discard= 0; |
| } |