Hello community,
here is the log from the commit of package yup
checked in at Tue Sep 26 00:51:49 CEST 2006.
--------
--- yup/yup.changes 2006-09-20 14:32:24.000000000 +0200
+++ yup/yup.changes 2006-09-25 15:41:29.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 25 15:41:12 CEST 2006 - meissner@suse.de
+
+- some bugfixes.
+- build our own CURL (for Digest auth) for SLES 9.
+
+-------------------------------------------------------------------
New:
----
COPYING.GPL
curl-7.15.5-CVE-2006-1061.patch
curl-7.15.5-aliasing.patch
curl-7.15.5-epsv-firewall.patch
curl-7.15.5-ipv6tests.patch
curl-7.15.5-lfs.patch
curl-7.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yup.spec ++++++
--- /var/tmp/diff_new_pack.btN9Xc/_old 2006-09-26 00:51:36.000000000 +0200
+++ /var/tmp/diff_new_pack.btN9Xc/_new 2006-09-26 00:51:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yup (Version 16)
+# spec file for package yup (Version 18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -8,20 +8,37 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: yup
-Version: 16
+%if 0%{suse_version} < 1010
+%define curl_name curl
+%define curl_version 7.15.5
+BuildRequires: libidn-devel openssl-devel
+License: GPL
+%else
+License: GPL
+BuildArch: noarch
+%endif
+Version: 18
Release: 1
Summary: "Yum Update Proxy" for SLE 10 Maintenance
Source0: yup.sh
Source1: yup.sysconfig
Source2: yup.1.pod
-License: GPL
+Source3: COPYING.GPL
+%if 0%{suse_version} < 1010
+Source10: %{curl_name}-%{curl_version}.tar.bz2
+Patch2: %{curl_name}-%{curl_version}-lfs.patch
+Patch3: %{curl_name}-%{curl_version}-aliasing.patch
+Patch4: %{curl_name}-%{curl_version}-ipv6tests.patch
+Patch5: %{curl_name}-%{curl_version}-epsv-firewall.patch
+Patch6: %{curl_name}-%{curl_version}-CVE-2006-1061.patch
+%endif
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
Requires: curl
-BuildArch: noarch
%description
This packages allows to configure an update-mirror for Novell
@@ -40,31 +57,86 @@
Ray Dassen
Matthias Eckermann
+%if 0%{suse_version} < 1010
+%endif
%prep
+%if 0%{suse_version} < 1010
+%setup -T -c -n %{curl_name}-%{curl_version} -a 10
+cd %{curl_name}-%{curl_version}
+%patch2
+##- %patch3
+%patch4
+%patch5
+##- %patch6
+%else
%setup -T -c
+%endif
%build
pod2man --center=" " --release="%{version}-%{release}" --date="$(date)" %{S:2} > yup.$$$$;
perl -p -e 's/.if n .na/.\\\".if n .na/;' yup.$$$$ > yup.1;
rm -f yup.$$$$
+%if 0%{suse_version} < 1010
+cd %{curl_name}-%{curl_version}
+autoreconf -fi
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
+ --prefix=%{_prefix} \
+ --program-suffix=-yup \
+ --enable-ipv6 \
+ --with-ssl \
+ --enable-static \
+ --disable-shared \
+ --libdir=%{_libdir}
+make %{?jobs:-j%jobs}
+%endif
%install
if [ -n "$RPM_BUILD_ROOT" ] ; then
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
fi
+%if 0%{suse_version} < 1010
+cd %{curl_name}-%{curl_version}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+if [ -n "$RPM_BUILD_ROOT" ] ; then
+ rm -rf $RPM_BUILD_ROOT/usr/src
+ rm -rf $RPM_BUILD_ROOT/usr/%{_libdir}
+ rm -rf $RPM_BUILD_ROOT/%{_libdir}
+ rm -rf $RPM_BUILD_ROOT/usr/include
+ rm -rf $RPM_BUILD_ROOT/usr/share/man
+ rm -rf $RPM_BUILD_ROOT/usr/bin/curl-config-yup
+ rm -rf $RPM_BUILD_ROOT/usr/share/curl/curl-ca-bundle.crt
+fi
+cd ..
+%endif
mkdir -p $RPM_BUILD_ROOT/usr/sbin \
$RPM_BUILD_ROOT/usr/share/man/man1 \
$RPM_BUILD_ROOT/var/adm/fillup-templates
install %{S:0} $RPM_BUILD_ROOT/usr/sbin/yup
install %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup
install yup.1 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1
+%if 0%{suse_version} < 1010
+sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/usr/sbin/yup
+sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup
+sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/usr/share/man/man1/yup.1
+%endif
gzip -9 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1
+cp -a %{S:3} .
+#
+# rpm -qa --queryformat='%%{name}/%%{version}/%%{release}/%%{arch}\n'| sort | bzip2 -9 > USEDFORBUILD.bz2
+#
%files
%defattr(-,root,root)
%attr(700, root, root) /usr/sbin/yup
/usr/share/man/man1/yup.1.gz
/var/adm/fillup-templates/sysconfig.yup
+# %doc USEDFORBUILD.bz2
+%doc COPYING.GPL
+%if 0%{suse_version} < 1010
+%doc %{curl_name}-%{curl_version}/{CHANGES,README,COPYING}
+%doc %{curl_name}-%{curl_version}/docs/{BUGS,CONTRIBUTE,FAQ,FEATURES,INTERNALS,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
+%{_prefix}/bin/curl-yup
+%endif
%post
%{fillup_and_insserv -i -n yup}
@@ -75,6 +147,9 @@
fi
%changelog -n yup
+* Mon Sep 25 2006 - meissner@suse.de
+- some bugfixes.
+- build our own CURL (for Digest auth) for SLES 9.
* Wed Sep 20 2006 - mge@suse.de
- Add better error handling; patch by
Ray Dassen