From 811a8c936ce77359695310d3d414338e064cd402 Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Thu, 18 Oct 2012 16:16:59 +0200 Subject: [PATCH] - updated to 1.2.2 --- .gitignore | 2 +- libpipeline-1.2.1-gnulib.patch | 122 --------------------------------- libpipeline.spec | 12 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 130 deletions(-) delete mode 100644 libpipeline-1.2.1-gnulib.patch diff --git a/.gitignore b/.gitignore index 0a3c45c..0165cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libpipeline-1.2.1.tar.gz +/libpipeline-1.2.2.tar.gz diff --git a/libpipeline-1.2.1-gnulib.patch b/libpipeline-1.2.1-gnulib.patch deleted file mode 100644 index 042de6b..0000000 --- a/libpipeline-1.2.1-gnulib.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -upr libpipeline-1.2.1.orig/configure libpipeline-1.2.1/configure ---- libpipeline-1.2.1.orig/configure 2012-03-02 20:55:41.000000000 +0100 -+++ libpipeline-1.2.1/configure 2012-07-23 14:43:27.119564858 +0200 -@@ -919,7 +919,6 @@ GNULIB_PERROR - GNULIB_PCLOSE - GNULIB_OBSTACK_PRINTF_POSIX - GNULIB_OBSTACK_PRINTF --GNULIB_GETS - GNULIB_GETLINE - GNULIB_GETDELIM - GNULIB_GETCHAR -@@ -17613,7 +17612,6 @@ fi - GNULIB_GETCHAR=0; - GNULIB_GETDELIM=0; - GNULIB_GETLINE=0; -- GNULIB_GETS=0; - GNULIB_OBSTACK_PRINTF=0; - GNULIB_OBSTACK_PRINTF_POSIX=0; - GNULIB_PCLOSE=0; -@@ -22070,7 +22068,6 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } - GNULIB_GETC=1 - GNULIB_GETCHAR=1 - GNULIB_FGETS=1 -- GNULIB_GETS=1 - GNULIB_FREAD=1 - - -@@ -22088,7 +22085,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } - - - -- for gl_func in dprintf fpurge fseeko ftello getdelim getline pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do -+ for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 - $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -diff -upr libpipeline-1.2.1.orig/gnulib/lib/stdio.in.h libpipeline-1.2.1/gnulib/lib/stdio.in.h ---- libpipeline-1.2.1.orig/gnulib/lib/stdio.in.h 2012-02-05 03:29:44.000000000 +0100 -+++ libpipeline-1.2.1/gnulib/lib/stdio.in.h 2012-07-23 14:43:27.096571041 +0200 -@@ -699,26 +699,14 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -- - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - struct obstack; - /* Grow an obstack with formatted output. Return the number of -@@ -1054,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header -diff -upr libpipeline-1.2.1.orig/gnulib/m4/stdio_h.m4 libpipeline-1.2.1/gnulib/m4/stdio_h.m4 ---- libpipeline-1.2.1.orig/gnulib/m4/stdio_h.m4 2012-02-05 03:29:45.000000000 +0100 -+++ libpipeline-1.2.1/gnulib/m4/stdio_h.m4 2012-07-23 14:45:02.696900197 +0200 -@@ -1,4 +1,4 @@ --# stdio_h.m4 serial 40 -+# stdio_h.m4 serial 41 - dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -18,7 +18,6 @@ AC_DEFUN([gl_STDIO_H], - GNULIB_GETC=1 - GNULIB_GETCHAR=1 - GNULIB_FGETS=1 -- GNULIB_GETS=1 - GNULIB_FREAD=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is -@@ -72,10 +71,10 @@ AC_DEFUN([gl_STDIO_H], - - dnl Check for declarations of anything we want to poison if the - dnl corresponding gnulib module is not in use, and which is not -- dnl guaranteed by C89. -+ dnl guaranteed by both C89 and C11. - gl_WARN_ON_USE_PREPARE([[#include -- ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen renameat -- snprintf tmpfile vdprintf vsnprintf]) -+ ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen -+ renameat snprintf tmpfile vdprintf vsnprintf]) - ]) - - AC_DEFUN([gl_STDIO_MODULE_INDICATOR], -@@ -113,7 +112,6 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], - GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) - GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) - GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) -- GNULIB_GETS=0; AC_SUBST([GNULIB_GETS]) - GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) - GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) - GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) diff --git a/libpipeline.spec b/libpipeline.spec index 10c2ba8..3a7d4fb 100644 --- a/libpipeline.spec +++ b/libpipeline.spec @@ -1,16 +1,14 @@ -%global gnulib_ver 20111211-stable +%global gnulib_ver 20120404-stable Summary: A pipeline manipulation library Name: libpipeline -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} License: GPLv3+ Group: Development/Libraries URL: http://libpipeline.nongnu.org/ Source: http://download.savannah.gnu.org/releases/libpipeline/libpipeline-%{version}.tar.gz -Patch: libpipeline-1.2.1-gnulib.patch - BuildRequires: libtool, check-devel # FPC exception for gnulib - copylib - https://fedorahosted.org/fpc/ticket/174 @@ -35,7 +33,6 @@ to develop programs that use libpipeline library. %prep %setup -q -%patch -p1 -b .gnulibpatch %build %{configure} @@ -63,6 +60,9 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libpipeline.la %{_mandir}/man3/* %changelog +* Thu Oct 18 2012 Peter Schiffer - 1.2.2-1 +- updated to 1.2.2 + * Thu Sep 06 2012 Peter Schiffer - 1.2.1-2 - enabled test suite at build time - cleaned .spec file diff --git a/sources b/sources index 3027e56..d8c9486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20896c919eca4acb3d2f13012fb7ba02 libpipeline-1.2.1.tar.gz +4367a3f598d171fd43dfa8620ed16d55 libpipeline-1.2.2.tar.gz