From b8daf83720e1aa6b563f7e9251bec855a15d8e3c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Jan 15 2018 11:08:35 +0000
Subject: Rebase to 0.162.1 to fix CVE-2017-9274


---

diff --git a/.gitignore b/.gitignore
index 0d9e2bf..8197f03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /osc-0.155.0.tar.gz
 /osc-0.157.1.tar.gz
 /osc-0.161.1.tar.gz
+/osc-0.162.1.tar.gz
diff --git a/osc.spec b/osc.spec
index c030d33..5ab3fac 100644
--- a/osc.spec
+++ b/osc.spec
@@ -1,42 +1,46 @@
 # SUSE guys use OBS to automatically handle release numbers,
 # when rebasing check what they are using on
-# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_26/
+# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_27/
 # update the obsrel to match the upstream release number
-%global obsrel 224.1
+%global obsrel 230.1
 
 # osc plugin support
 %global osc_plugin_dir %{_prefix}/lib/osc-plugins
 
+# for obs source services
+%global obsroot %{_prefix}/lib/obs
+%global obs_srcsvc_dir %{obsroot}/service
+
 # Real release number
 %global rel 1
 
 Name:           osc
-Version:        0.161.1
+Version:        0.162.1
 # Bump the release as necessary to ensure we're one level up from upstream
 Release:        %{obsrel}.%{rel}%{?dist}
 Group:          Development/Tools
 License:        GPLv2+
 Url:            https://github.com/openSUSE/osc
 Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Summary:        The openSUSE Build Service Commander
+Summary:        Open Build Service Commander
 BuildArch:      noarch
 
-BuildRequires:  python-devel
-BuildRequires:  rpm-python
+BuildRequires:  python2-devel
+BuildRequires:  python2-rpm
 BuildRequires:  python-urlgrabber
-Requires:       rpm-python
+Requires:       python2-rpm
 Requires:       m2crypto
-Requires:       python-lxml
+Requires:       python2-lxml
 Requires:       python-urlgrabber
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends:     osc-source_validator
+Recommends:     obs-service-source_validator
 %else
-Requires:       osc-source_validator
+Requires:       obs-service-source_validator
 %endif
 
 %description
-Commandline client for the openSUSE Build Service.
+Commandline client for the Open Build Service.
 
 See http://en.opensuse.org/openSUSE:OSC , as well as
 http://en.opensuse.org/openSUSE:Build_Service_Tutorial for a general
@@ -63,12 +67,15 @@ install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
 install -Dm0644 dist/complete.sh %{buildroot}%{_datadir}/bash-completion/completions/osc
 install -Dm0755 dist/osc.complete %{buildroot}%{_datadir}/osc/complete
 
+mkdir -p %{buildroot}%{obs_srcsvc_dir}
+
 mkdir -p %{buildroot}%{osc_plugin_dir}
 
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
 
 # osc rpm macros
 cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.osc <<EOM
+%%obs_srcsvc_dir %{obs_srcsvc_dir}
 %%osc_plugin_dir %{osc_plugin_dir}
 EOM
 
@@ -77,16 +84,21 @@ EOM
 %doc AUTHORS README TODO NEWS
 %license COPYING
 %{_bindir}/osc*
-%{python_sitelib}/*
+%{python2_sitelib}/*
 %{_sysconfdir}/profile.d/osc.csh
 %{_datadir}/bash-completion/completions/osc
 %dir %{_localstatedir}/lib/osc-plugins
 %{_mandir}/man1/osc.*
 %{_datadir}/osc
 %{_rpmconfigdir}/macros.d/macros.osc
+%dir %{obsroot}
+%dir %{obs_srcsvc_dir}
 %dir %{osc_plugin_dir}
 
 %changelog
+* Mon Jan 15 2018 Neal Gompa <ngompa13@gmail.com> - 0.162.1-230.1.1
+- Rebase to 0.162.1 to fix CVE-2017-9274
+
 * Sun Nov 05 2017 Neal Gompa <ngompa13@gmail.com> - 0.161.1-224.1.1
 - Rebase to 0.161.1
 
diff --git a/sources b/sources
index a1ddd8d..9270fa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osc-0.161.1.tar.gz) = 5baf67cc6bc7b9a54da20e3f89a648cea317dd36af47478e42e41e15ada19b01ddb86d7666003f02c0f13a544c49d5d2b89d1d8c98a14d24747db0e6483e5a3e
+SHA512 (osc-0.162.1.tar.gz) = 0f5f7e522ad81721278574de3f3d98675bbeecc04bf6266caa471cbe664688a2f00a290676385f32dc095a9a3d74edd759742f32ea5fd222cd6276c6c1b9dd2b