Hello community,
here is the log from the commit of package rzsz for openSUSE:Factory checked in at 2013-11-24 13:32:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rzsz (Old)
and /work/SRC/openSUSE:Factory/.rzsz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rzsz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rzsz/rzsz.changes 2011-10-04 18:14:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rzsz.new/rzsz.changes 2013-11-24 13:32:47.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 14 20:30:02 UTC 2013 - dvaleev@suse.com
+
+- Drop obsoleted ftime. (drop_ftime.patch)
+ Broken under PowerKVM
+
+-------------------------------------------------------------------
New:
----
drop_ftime.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rzsz.spec ++++++
--- /var/tmp/diff_new_pack.IkREq1/_old 2013-11-24 13:32:47.000000000 +0100
+++ /var/tmp/diff_new_pack.IkREq1/_new 2013-11-24 13:32:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rzsz
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: rzsz
-License: GPL-2.0+
-Group: Hardware/Modem
Provides: lrzsz
-AutoReqProv: on
Url: http://www.ohse.de/uwe/software/lrzsz.html
Version: 0.12.20
-Release: 976
+Release: 0
Summary: X-, Y-, and Z-Modem Data Transfer Protocols
+License: GPL-2.0+
+Group: Hardware/Modem
Source: http://www.ohse.de/uwe/releases/lrzsz-%{version}.tar.bz2
Patch: lrzsz-%{version}.dif
Patch1: lrzsz-po.patch
Patch2: lrzsz-0.12.20-use-after-free.patch
+Patch3: drop_ftime.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,6 +42,7 @@
%patch
%patch1
%patch2 -p1
+%patch3 -p1
%build
%configure --prefix=/usr \
++++++ drop_ftime.patch ++++++
Index: lrzsz-0.12.20/configure
===================================================================
--- lrzsz-0.12.20.orig/configure
+++ lrzsz-0.12.20/configure
@@ -3409,123 +3409,6 @@ cat >> confdefs.h <<\EOF
#define HAVE_STRERROR 1
EOF
-
-
-
-echo $ac_n "checking for ftime""... $ac_c" 1>&6
-echo "configure:3417: checking for ftime" >&5
-if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char ftime();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_ftime) || defined (__stub___ftime)
-choke me
-#else
-ftime();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_func_ftime=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_ftime=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6
-echo "configure:3460: checking that ftime works correctly" >&5
-if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- lrzsz_cv_sys_ftime_ok=runtime
-else
- cat > conftest.$ac_ext <
-#include
-#include
-main ()
-{
- struct timeb s, slast;
- int c = 0;
- ftime (&slast);
- while (c < 10)
- {
- ftime (&s);
- if (s.time < slast.time
- || (s.time == slast.time && s.millitm < slast.millitm)) {
- fprintf(stderr,"s: %ld, %ld, slast: %ld, %ld\n",
- s.time,s.millitm, slast.time,slast.millitm);
- exit (1);
- }
- if (s.time != slast.time)
- ++c;
- slast.time = s.time;
- slast.millitm = s.millitm;
- }
- exit (0);
-}
-
-EOF
-if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
- lrzsz_cv_sys_ftime_ok=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- lrzsz_cv_sys_ftime_ok=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-case $lrzsz_cv_sys_ftime_ok in
-yes) cat >> confdefs.h <<\EOF
-#define HAVE_FTIME 1
-EOF
- echo "$ac_t""yes" 1>&6 ;;
-no) echo "$ac_t""no" 1>&6
- echo "configure: warning: ftime seems to be buggy" 1>&2 ;;
-runtime) cat >> confdefs.h <<\EOF
-#define HAVE_FTIME 1
-EOF
-
- echo "$ac_t""will check at run time" 1>&6 ;;
-esac
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
echo $ac_n "checking for timezone variable""... $ac_c" 1>&6
echo "configure:3531: checking for timezone variable" >&5
if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then
Index: lrzsz-0.12.20/configure.in
===================================================================
--- lrzsz-0.12.20.orig/configure.in
+++ lrzsz-0.12.20/configure.in
@@ -168,52 +168,6 @@ AC_DEFINE(HAVE_STRERROR)
dnl special tests
-
-dnl this is taken from taylor uucp.
-dnl Check for the SCO buggy ftime; the code can cope with the bug,
-dnl though it would prefer not to, so if we're cross-configuring we
-dnl accept that ftime exists.
-AC_CHECK_FUNC(ftime,
-[AC_MSG_CHECKING(that ftime works correctly)
-AC_CACHE_VAL(lrzsz_cv_sys_ftime_ok,
-[AC_TRY_RUN([
-#include
-#include
-#include
-main ()
-{
- struct timeb s, slast;
- int c = 0;
- ftime (&slast);
- while (c < 10)
- {
- ftime (&s);
- if (s.time < slast.time
- || (s.time == slast.time && s.millitm < slast.millitm)) {
- fprintf(stderr,"s: %ld, %ld, slast: %ld, %ld\n",
- s.time,s.millitm, slast.time,slast.millitm);
- exit (1);
- }
- if (s.time != slast.time)
- ++c;
- slast.time = s.time;
- slast.millitm = s.millitm;
- }
- exit (0);
-}
-],
-lrzsz_cv_sys_ftime_ok=yes,
-lrzsz_cv_sys_ftime_ok=no,
-lrzsz_cv_sys_ftime_ok=runtime)])
-case $lrzsz_cv_sys_ftime_ok in
-yes) AC_DEFINE(HAVE_FTIME) AC_MSG_RESULT(yes) ;;
-no) AC_MSG_RESULT(no)
- AC_MSG_WARN(ftime seems to be buggy) ;;
-runtime) AC_DEFINE(HAVE_FTIME)
- AC_MSG_RESULT(will check at run time) ;;
-esac
-])
-
dnl
AC_MSG_CHECKING([for timezone variable])
AC_CACHE_VAL(libquark_cv_var_timezone,[
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org