Hello community, here is the log from the commit of package socat for openSUSE:Factory checked in at 2015-03-29 20:15:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/socat (Old) and /work/SRC/openSUSE:Factory/.socat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "socat" Changes: -------- --- /work/SRC/openSUSE:Factory/socat/socat.changes 2014-11-04 17:27:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.socat.new/socat.changes 2015-03-29 20:15:24.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 25 15:29:21 UTC 2015 - p.drou...@gmail.com + +- Update to version 1.7.3.0 + * Too many changes to list; please read the CHANGES file for news +- Remove redundant %clean section +- Update fix-linux-errqueue.h-not-found.patch and socat-remove_date.patch + +------------------------------------------------------------------- Old: ---- socat-1.7.2.4.tar.bz2 New: ---- socat-1.7.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ socat.spec ++++++ --- /var/tmp/diff_new_pack.OQcUOw/_old 2015-03-29 20:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.OQcUOw/_new 2015-03-29 20:15:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package socat # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ BuildRequires: procps BuildRequires: readline-devel BuildRequires: tcpd-devel -Version: 1.7.2.4 +Version: 1.7.3.0 Release: 0 Url: http://www.dest-unreach.org/socat/ Summary: Multipurpose relay for bidirectional data transfer @@ -59,9 +59,6 @@ ${RPM_BUILD_ROOT}/%{_mandir}/man1 %{__make} DESTDIR=${RPM_BUILD_ROOT} install -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - %files %defattr(-,root,root) %doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY VERSION examples ++++++ fix-linux-errqueue.h-not-found.patch ++++++ --- /var/tmp/diff_new_pack.OQcUOw/_old 2015-03-29 20:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.OQcUOw/_new 2015-03-29 20:15:25.000000000 +0200 @@ -25,13 +25,14 @@ =================================================================== --- socat-1.7.2.4.orig/configure.in +++ socat-1.7.2.4/configure.in -@@ -79,8 +79,7 @@ AC_HEADER_RESOLV() +@@ -80,9 +80,7 @@ AC_CHECK_HEADERS(termios.h linux/if_tun.h) AC_CHECK_HEADERS(net/if_dl.h) -AC_CHECK_HEADERS(linux/types.h) --AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>]) -+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h) +-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <sys/time.h> +-#include <linux/types.h>]) ++AC_CHECK_HEADERS(linux/types.h linux/errqueue.h sys/time.h) AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h) AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h) AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h) @@ -39,12 +40,12 @@ =================================================================== --- socat-1.7.2.4.orig/configure +++ socat-1.7.2.4/configure -@@ -3968,26 +3968,19 @@ fi +@@ -3980,27 +3980,19 @@ done -for ac_header in linux/types.h -+for ac_header in linux/types.h linux/errqueue.h ++for ac_header in linux/types.h linux/errqueue.h sys/time.h do : - ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_types_h" = xyes; then : @@ -60,7 +61,8 @@ done --ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <linux/types.h> +-ac_fn_c_check_header_compile "$LINENO" "linux/errqueue.h" "ac_cv_header_linux_errqueue_h" "#include <sys/time.h> +-#include <linux/types.h> -" -if test "x$ac_cv_header_linux_errqueue_h" = xyes; then : - $as_echo "#define HAVE_LINUX_ERRQUEUE_H 1" >>confdefs.h ++++++ socat-1.7.2.4.tar.bz2 -> socat-1.7.3.0.tar.bz2 ++++++ ++++ 12392 lines of diff (skipped) ++++++ socat-remove_date.patch ++++++ --- /var/tmp/diff_new_pack.OQcUOw/_old 2015-03-29 20:15:25.000000000 +0200 +++ /var/tmp/diff_new_pack.OQcUOw/_new 2015-03-29 20:15:25.000000000 +0200 @@ -15,22 +15,21 @@ =================================================================== --- socat-1.7.2.3.orig/socat.c 2011-12-06 07:44:41.000000000 +0000 +++ socat-1.7.2.3/socat.c 2014-03-03 19:31:00.000000000 +0000 -@@ -70,8 +70,6 @@ static int socat_newchild(void); +@@ -70,7 +70,6 @@ static const char socatversion[] = #include "./VERSION" ; --static const char timestamp[] = __DATE__" "__TIME__; -- +-static const char timestamp[] = BUILD_DATE; + const char copyright_socat[] = "socat by Gerhard Rieger - see www.dest-unreach.org"; #if WITH_OPENSSL - const char copyright_openssl[] = "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"; -@@ -273,7 +271,7 @@ int main(int argc, const char *argv[]) { +@@ -273,7 +272,7 @@ Info(copyright_openssl); Info(copyright_ssleay); #endif - Debug2("socat version %s on %s", socatversion, timestamp); + Debug1("socat version %s", socatversion); - xiosetenv("VERSION", socatversion, 1); /* SOCAT_VERSION */ + xiosetenv("VERSION", socatversion, 1, NULL); /* SOCAT_VERSION */ uname(&ubuf); /* ! here we circumvent internal tracing (Uname) */ Debug4("running on %s version %s, release %s, machine %s\n", @@ -363,7 +361,7 @@ void socat_version(FILE *fd) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
