Hello community,
here is the log from the commit of package yup
checked in at Mon Jul 2 15:11:21 CEST 2007.
--------
--- yup/yup.changes 2007-06-21 15:36:52.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yup/yup.changes 2007-07-02 14:24:33.014669000 +0200
@@ -2 +2 @@
-Thu Jun 21 15:36:38 CEST 2007 - adrian@suse.de
+Mon Jun 25 11:06:25 CEST 2007 - mge@novell.com
@@ -4 +4 @@
-- fix changelog entry order
+- add and package yup2zlm beta 0.4
@@ -7 +7 @@
-Mon Feb 26 16:46:23 CET 2007 - meissner@suse.de
+Fri Jun 22 10:37:30 CEST 2007 - mge@novell.com
@@ -9 +9,30 @@
-- do not use permissions, just set umask 077 before fillup.
+- do not package yup2zlm for now
+
+-------------------------------------------------------------------
+Thu Jun 21 09:38:25 CEST 2007 - mge@novell.com
+
+- better handling of metadata
+- man-page enhancements
+
+-------------------------------------------------------------------
+Wed May 23 15:18:52 CEST 2007 - mge@novell.com
+
+- better permissions support
+
+-------------------------------------------------------------------
+Tue May 22 01:21:36 CEST 2007 - mge@novell.com
+
+- adopt for SLE 10 SP 1
+- add yup2zlm by Jo de Baer
+
+-------------------------------------------------------------------
+Tue Feb 13 16:32:29 CET 2007 - rdassen@novell.com
+
+- yup.1.pod: Fixed typo paramters -> parameters
+
+-------------------------------------------------------------------
+Mon Jan 15 16:34:23 CET 2007 - mge@suse.de
+
+- apply small patch of Peter Surda - Thanks to him:
+ * introduce "--time-cond $localfile" to curl-download
+ * fix typo (YUP instead of correct YOU)
@@ -35,5 +63,0 @@
-Tue Nov 7 08:27:08 CET 2006 - meissner@suse.de
-
-- use 644 manpage permissions
-
--------------------------------------------------------------------
@@ -53,0 +78,5 @@
+Fri Oct 13 13:47:17 CEST 2006 - rdassen@novell.com
+
+- Reworked the manual page.
+
+-------------------------------------------------------------------
@@ -69,2 +98,2 @@
-- Replaced the
- command | while read line; do ... done
+- Replaced the
+ command | while read line; do ... done
@@ -72,4 +101,4 @@
- command > tempfile
- {
- while read line; do ... done
- } < tempfile
+ command > tempfile
+ {
+ while read line; do ... done
+ } < tempfile
@@ -86 +114,0 @@
-
@@ -97,4 +125,3 @@
-Mon Sep 25 15:41:12 CEST 2006 - meissner@suse.de
-
-- some bugfixes.
-- build our own CURL (for Digest auth) for SLES 9.
+Tue Sep 19 15:19:02 CEST 2006 - mge@suse.de
+- Add better error handling; patch by Ray Dassen
+ Fixes Novell Bug #206660
@@ -103 +130 @@
-Wed Sep 20 14:32:01 CEST 2006 - mge@suse.de
+Fri Sep 15 07:43:11 CEST 2006 - mge@suse.de
@@ -105,3 +131,0 @@
-- Add better error handling; patch by
- Ray Dassen
- Fixes Novell Bug #206660
@@ -112 +135,0 @@
-- add ability to have different servers for different products
New:
----
Advanced_SLES10_Patching_0.2.pdf
yup2zlm.sh
yup2zlm.sysconfig
yup.permissions
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yup.spec ++++++
--- /var/tmp/diff_new_pack.H22767/_old 2007-07-02 15:10:09.000000000 +0200
+++ /var/tmp/diff_new_pack.H22767/_new 2007-07-02 15:10:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yup (Version 47)
+# spec file for package yup (Version 222)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,22 +11,26 @@
# norootforbuild
Name: yup
-BuildRequires: libidn-devel openssl-devel perl
%if 0%{suse_version} < 1010
+BuildRequires: libidn-devel openssl-devel
%define curl_name curl
%define curl_version 7.15.5
-License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL)
+License: GPL v2 or later, MOZILLA PUBLIC LICENSE (MPL/NPL)
%else
-License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL)
+License: GPL v2 or later, MOZILLA PUBLIC LICENSE (MPL/NPL)
BuildArch: noarch
%endif
-Version: 47
-Release: 39
+Version: 222
+Release: 1
Summary: "Yum Update Proxy" for SLE 10 Maintenance
Source0: yup.sh
Source1: yup.sysconfig
Source2: yup.1.pod
Source3: COPYING.GPL
+Source4: yup.permissions
+Source5: yup2zlm.sh
+Source6: yup2zlm.sysconfig
+Source7: Advanced_SLES10_Patching_0.2.pdf
%if 0%{suse_version} < 1010
Source10: %{curl_name}-%{curl_version}.tar.bz2
Patch2: %{curl_name}-%{curl_version}-lfs.patch
@@ -37,6 +41,8 @@
%endif
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: perl
+PreReq: %fillup_prereq
Requires: curl
%description
@@ -74,7 +80,6 @@
%build
pod2man --center=" " --release="%{version}-%{release}" --date="$(date)" %{S:2} > yup.$$$$;
perl -p -e 's/.if n .na/.\\\".if n .na/;' yup.$$$$ > yup.1;
-chmod 644 yup.1
rm -f yup.$$$$
%if 0%{suse_version} < 1010
cd %{curl_name}-%{curl_version}
@@ -92,6 +97,9 @@
%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}
@@ -110,45 +118,70 @@
$RPM_BUILD_ROOT/etc/permissions.d \
$RPM_BUILD_ROOT/usr/share/man/man1 \
$RPM_BUILD_ROOT/var/adm/fillup-templates
-install -c -m 755 %{S:0} $RPM_BUILD_ROOT/usr/sbin/yup
-install -c -m 600 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup
-install -c -m 644 yup.1 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1
+install %{S:0} $RPM_BUILD_ROOT/usr/sbin/yup
+cp -a %{S:7} .
+install %{S:5} $RPM_BUILD_ROOT/usr/sbin/yup2zlm
+install %{S:6} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup2zlm
+install %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup
+install %{S:4} $RPM_BUILD_ROOT/etc/permissions.d/yup
+install -m 644 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
+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
-%attr(644, root, root)/usr/share/man/man1/yup.1*
+%attr(700, root, root) /usr/sbin/yup2zlm
+%attr(600, root, root) /etc/permissions.d/yup
+%attr(644, root, root) /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
+%doc Advanced_SLES10_Patching_0.2.pdf
+/var/adm/fillup-templates/sysconfig.yup2zlm
+%doc USEDFORBUILD.bz2
%post
-umask 077
-%{fillup_and_insserv -i -n yup}
+%{fillup_only -n yup}
+%{fillup_only -n yup2zlm}
+chmod go-r /etc/sysconfig/yup*
%clean
-rm -rf $RPM_BUILD_ROOT
+if [ -n "$RPM_BUILD_ROOT" ] ; then
+ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+fi
%changelog
-* Thu Jun 21 2007 - adrian@suse.de
-- fix changelog entry order
-* Mon Feb 26 2007 - meissner@suse.de
-- do not use permissions, just set umask 077 before fillup.
+* Mon Jun 25 2007 - mge@novell.com
+- add and package yup2zlm beta 0.4
+* Fri Jun 22 2007 - mge@novell.com
+- do not package yup2zlm for now
+* Thu Jun 21 2007 - mge@novell.com
+- better handling of metadata
+- man-page enhancements
+* Wed May 23 2007 - mge@novell.com
+- better permissions support
+* Tue May 22 2007 - mge@novell.com
+- adopt for SLE 10 SP 1
+- add yup2zlm by Jo de Baer
+* Tue Feb 13 2007 - rdassen@novell.com
+- yup.1.pod: Fixed typo paramters -> parameters
+* Mon Jan 15 2007 - mge@suse.de
+- apply small patch of Peter Surda - Thanks to him:
+ * introduce "--time-cond $localfile" to curl-download
+ * fix typo (YUP instead of correct YOU)
* Tue Dec 05 2006 - mge@suse.de
- add /etc/permissions.d/yup
* Wed Nov 29 2006 - mge@suse.de
@@ -160,8 +193,6 @@
thanks to Andreas Taschner for help
* Wed Nov 08 2006 - mge@suse.de
- add downloading of src.rpms from you.novell.com
-* Tue Nov 07 2006 - meissner@suse.de
-- use 644 manpage permissions
* Mon Oct 30 2006 - mge@suse.de
- introduce YUP_SRCRPM variable and combine with
patch/idea from Heiko Helmle posted on suse-sles-s
@@ -170,6 +201,8 @@
* Tue Oct 24 2006 - meissner@suse.de
- fixed the regular expressions for the sysconfig
variable range. [:xdigit:]{32} -> ^[[:xdigit:]]{32}$
+* Fri Oct 13 2006 - rdassen@novell.com
+- Reworked the manual page.
* Thu Oct 12 2006 - rdassen@novell.com
- SLES9's bash does not support `+=' for adding to strings. Changed to good
old foo="$foo bar" idiom.
@@ -201,18 +234,14 @@
* Tue Sep 26 2006 - rdassen@novell.com
- Propagate exit values for non-simple commands to really exit at errors.
- Use "yup" in the name of temp files.
-* 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
+* Tue Sep 19 2006 - mge@suse.de
+- Add better error handling; patch by Ray Dassen
Fixes Novell Bug #206660
+* Fri Sep 15 2006 - mge@suse.de
- add support for multiple architectures
- add support for different curl-path (YUP_CURL)
- add support for different keys for SLES, SLED and other products
( YUP_ID_SLED YUP_PASS_SLED YUP_ID_SLES YUP_PASS_SLES )
-- add ability to have different servers for different products
* Thu Aug 31 2006 - meissner@suse.de
- fixed typo in script for older bash versions.
* Wed Aug 30 2006 - meissner@suse.de
++++++ yup.1.pod ++++++
--- yup/yup.1.pod 2006-12-12 12:20:08.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yup/yup.1.pod 2007-07-02 14:04:41.000000000 +0200
@@ -51,7 +51,7 @@
=item YUP_DEST_DIR
-Destination path (script will create sub-directories there), default: F
+Destination path (script will create sub-directories there), default: F
=item YUP_ID
@@ -63,7 +63,7 @@
=item YUP_SERVER
-The update server to use, default F
+The update server to use, default F
=item YUP_ID_SLED
@@ -96,9 +96,13 @@
=item YUP_PRODUCTS
-Products to mirror (SLES10 and/or SLED10), default: SLES10. For DebugInfo and SDK see: YUP_DEBUGINFO, YUP_SDK.
+Products to mirror (SLES10 and/or SLED10), default: F<SLES10>. For DebugInfo and SDK see: YUP_DEBUGINFO, YUP_SDK.
SPACE separated list.
+=item YUP_SUBVERSIONS
+
+Which product releases of a product should be mirrored? (GA, SP1, SP2), default: F<GA>. SPACE separated list.
+
=item YUP_DEBUGINFO
Include DebugInfo in mirror? Default: F<no> Enable with F<yes>.
@@ -107,17 +111,22 @@
Include SDK in mirror? Default: F<no> Enable with F<yes>.
+=item YUP_DRYRUN
+
+Only show channels/URLs to access, do not download.
+Default: F<no> Enable with F<yes>.
+
=back
-Additionally here are some paramters for downloading the SRC-RPMs.
+Additionally here are some parameters for downloading the SRC-RPMs.
At the moment those packages are located on a different server (F),
-but in full sync with F.
+but in full sync with F.
=over
=item YUP_SRCRPM
-Include .src.rpms in mirror? Default: F<no> Enable with F<you>, to download from F, later in 2007 also downloads from F might be possible; enable this with F<yes>.
+Include .src.rpms in mirror? Default: F<no> Enable with F<you>, to download from F, later in 2007 also downloads from F might be possible; enable this with F<yes>.
=item YOU_NCC_ACCOUNT
@@ -133,6 +142,29 @@
=back
+=head2 Mirror credentials for SLE 10 SP 1
+
+For SUSE Linux Enterprise 10 SP 1 we enhanced the capabilities
+of the Novell Customer Center. For that reason please get
+your YUP mirror credentials there:
+
+=over
+
+=item Step 1) go into Novell Customer Center http://www.novell.com/center
+
+=item Step 2) click on "Products and Subscriptions --> List of Products and Subscriptions"
+
+=item Step 3) double click on any specific subscription
+
+=item Step 4) click on the mirror credentials link at the bottom of the page
+
+=item Step 5) if necessary, like first time accessing the page, click on the generate button
+
+=back
+
+The credentials and mirror sites will be listed.
+These values will be the same across all users and subscriptions for a specific company.
+
=head1 ERROR HANDLING
Yup will exit with an error status if meta data for a catalog (for example, the
@@ -164,9 +196,9 @@
=head1 SEE ALSO
-The Novell knowledge base, Lhttp://support.novell.com.
+L, L
-L
+The Novell knowledge base, Lhttp://support.novell.com.
=head1 NOTES
@@ -176,11 +208,14 @@
Yup is delivered without any maintenance, support and warranty.
-=head1 AUTHOR
+=head1 AUTHORS and CONTRIBUTORS
+
+Marcus Meissner, Eberhard Moenkeberg, Ray Dassen, Jo de Baer (yup2zlm),
+Thomas Maynard, Matthias Eckermann
=head1 LICENSE
-Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+Copyright (c) 2006,2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
++++++ yup.sh ++++++
--- yup/yup.sh 2006-12-12 12:20:54.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yup/yup.sh 2007-07-02 14:04:41.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
#
# YUP - "Yum Update Proxy" for SLE 10 Maintenance
-# Copyright (C) 2006 SUSE Linux Products GmbH
+# Copyright (C) 2006,2007 SUSE Linux Products GmbH
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
# Proxy. The resulting configuration can be found in
# /etc/sysconfig/proxy and /root/.curlrc (authentication data).
#
-# $Id: yup.sh 76 2006-11-29 12:59:37Z mge $
+# $Id: yup.sh 215 2007-06-21 00:44:49Z mge $
#
# Fail on errors in simple commands.
@@ -73,7 +73,7 @@
# Fetch the URL. As this command may fail, run it in a subshell so
# as not to exit immediately.
- ( $YUP_CURL $YUP_CURLPARAMS $url -o $localfile > $CURLTMPFILE 2>&1 )
+ ( $YUP_CURL $YUP_CURLCRED $YUP_CURLPARAMS --time-cond $localfile $url -o $localfile > $CURLTMPFILE 2>&1 )
rc=$?
if [ $rc -eq 0 ] ; then
echo "done"
@@ -96,7 +96,7 @@
rpm -qKsp --nosignature $url > /dev/null
rc=$?
if [ $rc -eq 0 ] ; then
- echo ""
+ echo -e -n ""
else
if test -f "$uri"; then
echo " broken file, renaming, ..."
@@ -112,9 +112,15 @@
fetch_url "$bn/repodata/repomd.xml.asc" "repodata/repomd.xml.asc"
fetch_url "$bn/repodata/repomd.xml.key" "repodata/repomd.xml.key"
fetch_url "$bn/repodata/repomd.xml" "repodata/repomd.xml"
- fetch_url "$bn/repodata/filelists.xml.gz" "repodata/filelists.xml.gz"
- fetch_url "$bn/repodata/primary.xml.gz" "repodata/primary.xml.gz"
- fetch_url "$bn/repodata/patches.xml" "repodata/patches.xml"
+ grep -E "location[[:space:]]*href" repodata/repomd.xml | grep -v 'other.xml.gz' > $LOOPTMPFILE
+ {
+ while read line ; do
+ uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'`
+ dn=`dirname $uri`
+ test -d $dn || mkdir -p $dn
+ fetch_url "$bn/$uri" "$uri"
+ done || exit $?
+ } < $LOOPTMPFILE
}
function fetch_binrpms() {
@@ -130,7 +136,7 @@
uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'`
dn=`dirname $uri`
test -d $dn || mkdir -p $dn
- echo -e -n "$uri"
+ # echo -e -n "$uri"
verify_rpm "$uri"
if ! test -f "$uri"; then
if ! fetch_url "$bn/$uri" "$uri" ; then
@@ -152,7 +158,7 @@
uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'`
dn=`dirname $uri`
test -d $dn || mkdir -p $dn
- echo -e -n "$uri"
+ # echo -e -n "$uri"
verify_rpm "$uri"
if ! test -f "$uri"; then
if ! fetch_url "$bn/$uri" "$uri" ; then
@@ -232,18 +238,11 @@
# evaluate update parameters
#
echo "YUP_CURL ="${YUP_CURL:="/usr/bin/curl"}
- echo "YUP_CURLPARAMS ="${YUP_CURLPARAMS:="--verbose --digest --remote-time --fail"}
- # --verbose: we use a wrapper function and only display curl output in
- # case of errors; in that case, we want details.
- #
- # --fail: we want curl to exit with a non-zero exit status when a URL
- # could not be retrieved, in particular for things like invalid
- # credentials (HTTP 403)
-
- echo "YUP_SERVER ="${YUP_SERVER:="update.novell.com"}
- echo "YOU_SERVER ="${YUP_SERVER:="you.novell.com"}
- echo "YUP_DEST_DIR ="${YUP_DEST_DIR:="/tmp/SLE10-YUP"}
+ echo "YUP_SERVER ="${YUP_SERVER:="nu.novell.com"}
+ echo "YOU_SERVER ="${YOU_SERVER:="you.novell.com"}
+ echo "YUP_DEST_DIR ="${YUP_DEST_DIR:="/var/cache/yup"}
echo "YUP_ARCH ="${YUP_ARCH:="i586"}
+ echo "YUP_SUBVERSIONS="${YUP_SUBVERSIONS:="GA"}
if [ "${YUP_DEBUGINFO}." = "yes." ] ; then
YUP_PRODUCTS="${YUP_PRODUCTS:=SLES10} SLE10-Debug"
else
@@ -253,7 +252,21 @@
YUP_PRODUCTS="$YUP_PRODUCTS SDK10"
fi
echo "YUP_PRODUCTS =$YUP_PRODUCTS"
-
+ echo "YUP_CURLPARAMS ="${YUP_CURLPARAMS:="--verbose --remote-time --fail"} > /dev/null
+ # --verbose: we use a wrapper function and only display curl output in
+ # case of errors; in that case, we want details.
+ #
+ # --fail: we want curl to exit with a non-zero exit status when a URL
+ # could not be retrieved, in particular for things like invalid
+ # credentials (HTTP 403)
+ YUP_CURLPARAMS=$( echo $YUP_CURLPARAMS | sed s/--digest//g );
+ YUP_CURLPARAMS=$( echo $YUP_CURLPARAMS | sed s/--basic//g );
+ if [ "$YUP_SERVER" = "update.novell.com" ]; then
+ YUP_CURLPARAMS="--digest $YUP_CURLPARAMS"
+ elif [ "$YUP_SERVER" = "nu.novell.com" ]; then
+ YUP_CURLPARAMS="--basic $YUP_CURLPARAMS"
+ fi
+ echo "YUP_CURLPARAMS ="$YUP_CURLPARAMS
#
if [ "${YUP_ID}." = "." ] || [ "${YUP_PASS}." = "." ] ; then
if [ "${YUP_ID_SLED}." = "." ] || [ "${YUP_PASS_SLED}." = "." ] ; then
@@ -287,73 +300,101 @@
useID=$YUP_ID
usePASS=$YUP_PASS
useSERVER=$YUP_SERVER
- if [ "${SLE}." = "SLES10." ]; then
- UPD="SLES10-Updates/sles-10"
- if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then
- useID=$YUP_ID_SLES
- usePASS=$YUP_PASS_SLES
- fi
- if [ "${YUP_SERVER_SLES}." != "." ] ; then
- useSERVER=$YUP_SERVER_SLES
- fi
- elif [ "${SLE}." = "SLE10-Debug." ]; then
- UPD="SLE10-Debuginfo-Updates/sles-10"
- if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then
- useID=$YUP_ID_SLES
- usePASS=$YUP_PASS_SLES
+ for SVN in $YUP_SUBVERSIONS; do
+ if [ "$SVN" = "GA" ]; then
+ SVNSUFFIX=""
+ SUBCHANNELS="-Updates"
+ elif [ "$SVN" = "SP1" ]; then
+ SVNSUFFIX="-SP1"
+ SUBCHANNELS="-Updates -Online"
fi
- if [ "${YUP_SERVER_SLES}." != "." ] ; then
- useSERVER=$YUP_SERVER_SLES
- fi
- elif [ "${SLE}." = "SLED10." ]; then
- UPD="SLED10-Updates/sled-10"
- if [ "${YUP_ID_SLED}." != "." ] && [ "${YUP_PASS_SLED}." != "." ] ; then
- useID=$YUP_ID_SLED
- usePASS=$YUP_PASS_SLED
- fi
- if [ "${YUP_SERVER_SLED}." != "." ] ; then
- useSERVER=$YUP_SERVER_SLED
- fi
- elif [ "${SLE}." = "SDK10." ]; then
- UPD="SLE10-SDK-Updates/sles-10"
- if [ "${YUP_ID}." = "." ] || [ "${YUP_PASS}." = "." ] ; then
- if [ "${YUP_ID_SLES}." = "." ] || [ "${YUP_PASS_SLES}." = "." ] ; then
- useID=$YUP_ID_SLED
- usePASS=$YUP_PASS_SLED
+ for CHLSUFFIX in $SUBCHANNELS; do
+ if [ "${SLE}." = "SLES10." ]; then
+ UPD="SLES10$SVNSUFFIX$CHLSUFFIX/sles-10"
+ if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then
+ useID=$YUP_ID_SLES
+ usePASS=$YUP_PASS_SLES
+ fi
+ if [ "${YUP_SERVER_SLES}." != "." ] ; then
+ useSERVER=$YUP_SERVER_SLES
+ fi
+ elif [ "${SLE}." = "SLE10-Debug." ]; then
+ if [ "$CHLSUFFIX" = "-Online" ] ; then
+ UPD="."
+ else
+ UPD="SLE10$SVNSUFFIX-Debuginfo$CHLSUFFIX/sles-10"
+ if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then
+ useID=$YUP_ID_SLES
+ usePASS=$YUP_PASS_SLES
+ fi
+ if [ "${YUP_SERVER_SLES}." != "." ] ; then
+ useSERVER=$YUP_SERVER_SLES
+ fi
+ fi
+ elif [ "${SLE}." = "SLED10." ]; then
+ if [ "$useARCH" = "i586" ] || [ "$useARCH" = "x86_64" ] ; then
+ UPD="SLED10$SVNSUFFIX$CHLSUFFIX/sled-10"
+ if [ "${YUP_ID_SLED}." != "." ] && [ "${YUP_PASS_SLED}." != "." ] ; then
+ useID=$YUP_ID_SLED
+ usePASS=$YUP_PASS_SLED
+ fi
+ if [ "${YUP_SERVER_SLED}." != "." ] ; then
+ useSERVER=$YUP_SERVER_SLED
+ fi
+ else
+ UPD="."
+ fi
+ elif [ "${SLE}." = "SDK10." ]; then
+ UPD="SLE10-SDK$SVNSUFFIX$CHLSUFFIX/sles-10"
+ if [ "${YUP_ID}." = "." ] || [ "${YUP_PASS}." = "." ] ; then
+ if [ "${YUP_ID_SLES}." = "." ] || [ "${YUP_PASS_SLES}." = "." ] ; then
+ useID=$YUP_ID_SLED
+ usePASS=$YUP_PASS_SLED
+ else
+ useID=$YUP_ID_SLES
+ usePASS=$YUP_PASS_SLES
+ fi
+ fi
+ if [ "${YUP_SERVER}." = "." ] ; then
+ if [ "${YUP_SERVER_SLES}." = "." ] ; then
+ useSERVER=$YUP_SERVER_SLED
+ else
+ useSERVER=$YUP_SERVER_SLES
+ fi
+ fi
else
- useID=$YUP_ID_SLES
- usePASS=$YUP_PASS_SLES
+ echo "Warning: SLE $SLE unknown. Proceeding anyways ..."
+ # exit 1
fi
- fi
- if [ "${YUP_SERVER}." = "." ] ; then
- if [ "${YUP_SERVER_SLES}." = "." ] ; then
- useSERVER=$YUP_SERVER_SLED
- else
- useSERVER=$YUP_SERVER_SLES
+ if [ "$UPD" != "." ] ; then
+ bn="https://${useSERVER}/repo/\$RCE/${UPD}-${useARCH}"
+ YUP_CURLCRED=" --user ${useID}:${usePASS} "
+ if [ "$YUP_DRYRUN" = "yes" ] ; then
+ echo "URL: $bn"
+ else
+ echo "Using $bn"
+ mkdir -p ${YUP_DEST_DIR}/${UPD}-${useARCH}
+ cd ${YUP_DEST_DIR}/${UPD}-${useARCH}
+ mkdir -p repodata 2>/dev/null
+ fetch_repodata $bn
+ fetch_binrpms $bn
+ fetch_repomd $bn
+ fetch_patchrpms $bn
+ fi
fi
- fi
- else
- echo "Warning: SLE $SLE unknown. Proceeding anyways ..."
- # exit 1
- fi
- bn="https://${useID}:${usePASS}@${useSERVER}/repo/\$RCE/${UPD}-${useARCH}"
- echo "Using $bn"
- mkdir -p ${YUP_DEST_DIR}/${SLE}/${useARCH}
- cd ${YUP_DEST_DIR}/${SLE}/${useARCH}
- mkdir -p repodata 2>/dev/null
- fetch_repodata $bn
- fetch_binrpms $bn
- fetch_repomd $bn
- fetch_patchrpms $bn
+ done || exit $?
+ done || exit $?
done || exit $?
done || exit $?
#
- # Get Source RPMs
+ # Get Source RPMs from you.novell.com
#
if [ "${YUP_SRCRPM}." = "you." ] ; then
YUP_CURLPARAMS=$( echo $YUP_CURLPARAMS | sed s/--digest//g );
- YUP_CURLPARAMS="$YUP_CURLPARAMS --basic --user $YOU_NCC_ACCOUNT:$YOU_NCC_PASSWORD "
+ YUP_CURLPARAMS=$( echo $YUP_CURLPARAMS | sed s/--basic//g );
+ YUP_CURLPARAMS="$YUP_CURLPARAMS --basic "
+ YUP_CURLCRED=" --user $YOU_NCC_ACCOUNT:$YOU_NCC_PASSWORD "
for useARCH in $YUP_ARCH; do
useSERVER=$YOU_SERVER
for SLE in $YUP_PRODUCTS; do
@@ -370,8 +411,8 @@
YOU_useARCH=$( echo $useARCH | sed s/i586/i386/g );
bn="https://${useSERVER}/update/$YOU_useARCH/update/${UPD}"
echo "Using $bn"
- mkdir -p ${YUP_DEST_DIR}/${SLE}/${useARCH}
- cd ${YUP_DEST_DIR}/${SLE}/${useARCH}
+ mkdir -p ${YUP_DEST_DIR}/${UPD}-${useARCH}
+ cd ${YUP_DEST_DIR}/${UPD}-${useARCH}
mkdir -p repodata 2>/dev/null
fetch_repodata $bn
fetch_srcrpms $bn
++++++ yup.sysconfig ++++++
--- yup/yup.sysconfig 2006-12-12 12:25:08.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yup/yup.sysconfig 2007-07-02 14:04:41.000000000 +0200
@@ -2,7 +2,7 @@
## Description: YUP - "Yum Update Proxy" for SLE 10 Maintenance
#
# YUP - "Yum Update Proxy" for SLE 10 Maintenance
-# Copyright (C) 2006 SUSE Linux Products GmbH
+# Copyright (C) 2006,2007 SUSE Linux Products GmbH
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -33,6 +33,8 @@
# Proxy. The resulting configuration can be found in
# /etc/sysconfig/proxy and /root/.curlrc (authentication data).
#
+# $Id:$
+#
## Type: string
## Default: "/usr/bin/curl"
@@ -51,38 +53,50 @@
YUP_CURLPARAMS=""
## Type: string
-## Default: "/tmp/SLE10-YUP"
+## Default: "/var/cache/yup"
#
# destination path (script will create subdirectories there)
#
YUP_DEST_DIR=""
-## Type: regexp(^[[:xdigit:]]{32}$)
+## Type: string
## Default: ""
#
-# Machine ID: this value is in
-# /etc/zmd/deviceid
-# on the machine you registered with.
-# This is the default ID and also used for the SDK.
+# There are two options, to get the ID:
+#
+# 1. use the Machine ID: this value is in
+# /etc/zmd/deviceid
+# on the machine you registered with.
+#
+# 2. go to the Novell Customer Center and request
+# "mirror credentials" to get updates to all your
+# systems with one yup run
+# http://www.novell.com/center/
#
YUP_ID=""
-## Type: regexp(^[[:xdigit:]]{32}$)
+## Type: string
## Default: ""
#
-# Machine Secret: this value is in
-# /etc/zmd/secret
-# on the machine you registered with.
-# This is the default Secret and also used for the SDK.
+# There are two options, to get the PASSWORD:
+#
+# 1. use the Machine Secret: this value is in
+# /etc/zmd/secret
+# on the machine you registered with.
+#
+# 2. go to the Novell Customer Center and request
+# "mirror credentials" to get updates to all your
+# systems with one yup run
+# http://www.novell.com/center/
#
YUP_PASS=""
## Type: string
-## Default: "update.novell.com"
+## Default: "nu.novell.com"
#
# The update server to use
#
-YUP_SERVER="update.novell.com"
+YUP_SERVER="nu.novell.com"
## Type: regexp(^[[:xdigit:]]{0,32}$)
## Default: ""
@@ -145,7 +159,7 @@
#
YUP_ARCH=""
-## Type: string("SLES10","SLED10","SLES10 SLED10")
+## Type: string("SLES10","SLED10")
## Default: "SLES10"
#
# Products to mirror (SLES and/or SLED)
@@ -154,6 +168,15 @@
#
YUP_PRODUCTS=""
+## Type: string("GA","SP1","SP2")
+## Default: "GA"
+#
+# Subversions of product to mirror
+# SPACE separated list
+#
+YUP_SUBVERSIONS=""
+
+## Type: yesno
## Type: yesno
## Default: "no"
#
@@ -172,6 +195,8 @@
## Default: "no"
#
# Include .src.rpms in mirror?
+# yes: get sources from nu.novell.com
+# you: get yources from you.novell.com
#
YUP_SRCRPM="no"
@@ -196,3 +221,10 @@
#
YOU_SERVER="you.novell.com"
+## Type: yesno
+## Default: "no"
+#
+# Only show channels/URLs to access, do not download
+#
+YUP_DRYRUN="no"
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org