[python-django-horizon/el6: 11/11] Merge branch 'f17' into el6
by Pádraig Brady
commit bbf55f59cbeb77e6e77f9daeaf5020a1bdb35b64
Merge: 5ae994e cdc5153
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Fri Jun 1 00:48:31 2012 +0100
Merge branch 'f17' into el6
Conflicts:
python-django-horizon.spec
python-django-horizon-disable-nose.patch | 18 ++++++++++++++++++
python-django-horizon.spec | 6 ++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --cc python-django-horizon.spec
index 6deed21,6182eb8..84a5ac3
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -10,7 -10,7 +10,7 @@@
Name: python-django-horizon
Version: 2012.1
- Release: 5%{?dist}
-Release: 4%{?dist}
++Release: 6%{?dist}
Summary: Django application for talking to Openstack
Group: Development/Libraries
@@@ -25,8 -25,8 +25,9 @@@ Source1: openstack-dashboard.con
Patch1: %{name}-disable-debug.patch
Patch2: %{name}-default-db.patch
Patch3: xss-in-log-viewer.patch
-Patch4: CVE-2012-2144-session_fixation.patch
-Patch5: %{name}-disable-nose.patch
+Patch4: sphinx-sidebarwidth.patch
+Patch5: CVE-2012-2144-session_fixation.patch
++Patch6: %{name}-disable-nose.patch
Requires: Django >= 1.3.0
Requires: openstack-glance >= 2012.1
@@@ -92,6 -92,6 +93,7 @@@ Documentation for the Django Horizon ap
%patch3 -p1
%patch4 -p1
%patch5 -p1
++%patch6 -p1
%build
%{__python} setup.py build
@@@ -141,15 -141,12 +143,15 @@@ python %{_datadir}/openstack-dashboard/
%doc html
%changelog
- * Wed May 09 2012 Alan Pevec <apevec(a)redhat.com> - 2012.1-5
-* Wed May 09 2012 Alan Pevec <apevec(a)redhat.com> - 2012.1-4
++* Wed May 09 2012 Alan Pevec <apevec(a)redhat.com> - 2012.1-6
- Remove the currently uneeded dependency on python-django-nose
-* Thu May 03 2012 Pádraig Brady <P(a)draigBrady.com> - 2012.1-3
+* Thu May 03 2012 Pádraig Brady <P(a)draigBrady.com> - 2012.1-4
- CVE-2012-2144 session reuse vulnerability
+* Wed Apr 18 2012 Pádraig Brady <P(a)draigBrady.com> - 2012.1-3
+- Depend on Django >= 1.3.0 (now in epel)
+
* Tue Apr 17 2012 Pádraig Brady <P(a)draigBrady.com> - 2012.1-2
- CVE-2012-2094 XSS vulnerability in Horizon log viewer
- Configure the default database to use
11 years, 4 months
[python-django-horizon/el6] (11 commits) ...Merge branch 'f17' into el6
by Pádraig Brady
Summary of changes:
f23db94... - Update to rc1 snapshot - Drop no longer needed packages - (*)
9f652bb... Update to essex final release Package manage.py (bz 808219) (*)
dc1e43b... Drop sphinx dep, new version isn't available for f17 (*)
0eaad77... XSS vulnerability in Horizon log viewer (CVE-2012-2094) (*)
43be48e... configure the default database to use (*)
cda60ae... fix rpmlint warnings, including invalid source URL (*)
a1669d9... Merge branch 'master' into f17 (*)
dffb35e... Merge branch 'master' into f17 (*)
52371f3... fix removal of python-django-nose dependency (*)
cdc5153... Merge branch 'master' into f17 (*)
bbf55f5... Merge branch 'f17' into el6
(*) This commit already existed in another branch; no separate mail sent
11 years, 4 months
[python-django-horizon/f17: 2/2] Merge branch 'master' into f17
by Pádraig Brady
commit cdc51533c94fd89bf8273cc767c1d0059fc1590b
Merge: dffb35e 52371f3
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Fri Jun 1 00:46:05 2012 +0100
Merge branch 'master' into f17
python-django-horizon-disable-nose.patch | 18 ++++++++++++++++++
python-django-horizon.spec | 2 ++
2 files changed, 20 insertions(+), 0 deletions(-)
---
11 years, 4 months
[python-django-horizon] fix removal of python-django-nose dependency
by Pádraig Brady
commit 52371f37d216622882dc0b3e51870a9a09319ad0
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Thu May 31 23:42:11 2012 +0100
fix removal of python-django-nose dependency
The previous commit 169b5a2, neglected to remove
the references to python-django-nose in settings.py,
so include a patch to do that.
python-django-horizon-disable-nose.patch | 18 ++++++++++++++++++
python-django-horizon.spec | 2 ++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/python-django-horizon-disable-nose.patch b/python-django-horizon-disable-nose.patch
new file mode 100644
index 0000000..95051cd
--- /dev/null
+++ b/python-django-horizon-disable-nose.patch
@@ -0,0 +1,18 @@
+diff -Naur horizon-2012.1.orig/openstack_dashboard/settings.py horizon-2012.1/openstack_dashboard/settings.py
+--- horizon-2012.1.orig/openstack_dashboard/settings.py 2012-04-04 02:13:35.000000000 +0000
++++ horizon-2012.1/openstack_dashboard/settings.py 2012-05-31 22:40:08.268637001 +0000
+@@ -94,14 +94,12 @@
+ 'django.contrib.sessions',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+- 'django_nose',
+ 'horizon',
+ 'horizon.dashboards.nova',
+ 'horizon.dashboards.syspanel',
+ 'horizon.dashboards.settings',
+ )
+
+-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+ AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+ MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
+
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 856a2b2..6182eb8 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -26,6 +26,7 @@ Patch1: %{name}-disable-debug.patch
Patch2: %{name}-default-db.patch
Patch3: xss-in-log-viewer.patch
Patch4: CVE-2012-2144-session_fixation.patch
+Patch5: %{name}-disable-nose.patch
Requires: Django >= 1.3.0
Requires: openstack-glance >= 2012.1
@@ -90,6 +91,7 @@ Documentation for the Django Horizon application for talking with Openstack
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__python} setup.py build
11 years, 4 months
[arpwatch] 2.1a15-20
by aledvink@fedoraproject.org
commit 77ee46de4806cdd3633867db048fabd4ad35718a
Author: Ales Ledvinka <aledvink(a)redhat.com>
Date: Thu May 31 18:02:28 2012 +0200
2.1a15-20
arpwatch.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/arpwatch.spec b/arpwatch.spec
index 9dc2385..082aaea 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -3,7 +3,7 @@
Name: arpwatch
Epoch: 14
Version: 2.1a15
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Network monitoring tools for tracking IP addresses on a network
Group: Applications/System
License: BSD with advertising
@@ -34,6 +34,7 @@ Patch8: arpwatch-2.1a15-nolocalpcap.patch
Patch9: arpwatch-2.1a15-bogon.patch
Patch10: arpwatch-2.1a15-extraman.patch
Patch11: arpwatch-exitcode.patch
+Patch12: arpwatch-2.1a15-dropgroup.patch
%description
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and
@@ -59,6 +60,7 @@ network.
%patch9 -p1 -b .bogon
%patch10 -p1 -b .extraman
%patch11 -p1 -b .exitcode
+%patch12 -p1 -b .dropgroup
%build
%configure
@@ -151,6 +153,9 @@ fi
%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
%changelog
+* Thu May 31 2012 Aleš Ledvinka <aledvink(a)redhat.com> 14:2.1a15-20
+- fix supplementary group list (#825328) (CVE-2012-2653)
+
* Thu Jan 19 2012 Jan Synáček <jsynacek(a)redhat.com> 14:2.1a15-19
- Turn on PrivateTmp=true in service file (#782477)
11 years, 4 months
[arpwatch] fix supplementary group list (#825328) (CVE-2012-2653)
by aledvink@fedoraproject.org
commit 8bc549f72386658144c2d13898eb1604954c998a
Author: Ales Ledvinka <aledvink(a)redhat.com>
Date: Thu May 31 17:57:54 2012 +0200
fix supplementary group list (#825328) (CVE-2012-2653)
arpwatch-2.1a15-dropgroup.patch | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/arpwatch-2.1a15-dropgroup.patch b/arpwatch-2.1a15-dropgroup.patch
new file mode 100644
index 0000000..b6a25f8
--- /dev/null
+++ b/arpwatch-2.1a15-dropgroup.patch
@@ -0,0 +1,12 @@
+diff -up arpwatch-2.1a15/arpwatch.c.dropgroup arpwatch-2.1a15/arpwatch.c
+--- arpwatch-2.1a15/arpwatch.c.dropgroup 2012-05-31 11:47:13.327901902 +0200
++++ arpwatch-2.1a15/arpwatch.c 2012-05-31 11:48:04.859900061 +0200
+@@ -147,7 +147,7 @@ void dropprivileges(const char* user)
+ struct passwd* pw;
+ pw = getpwnam( user );
+ if ( pw ) {
+- if ( initgroups(pw->pw_name, NULL) != 0 || setgid(pw->pw_gid) != 0 ||
++ if ( setgid(pw->pw_gid) != 0 || setgroups(0, NULL) != 0 ||
+ setuid(pw->pw_uid) != 0 ) {
+ syslog(LOG_ERR, "Couldn't change to '%.32s' uid=%d gid=%d", user,
+ pw->pw_uid, pw->pw_gid);
11 years, 4 months
[arpwatch/f17] 2.1a15-20
by aledvink@fedoraproject.org
commit acfcdec2c5f86cb161eaa6eaddf4667b35f7fa64
Author: Ales Ledvinka <aledvink(a)redhat.com>
Date: Thu May 31 18:02:28 2012 +0200
2.1a15-20
arpwatch.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/arpwatch.spec b/arpwatch.spec
index 9dc2385..082aaea 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -3,7 +3,7 @@
Name: arpwatch
Epoch: 14
Version: 2.1a15
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Network monitoring tools for tracking IP addresses on a network
Group: Applications/System
License: BSD with advertising
@@ -34,6 +34,7 @@ Patch8: arpwatch-2.1a15-nolocalpcap.patch
Patch9: arpwatch-2.1a15-bogon.patch
Patch10: arpwatch-2.1a15-extraman.patch
Patch11: arpwatch-exitcode.patch
+Patch12: arpwatch-2.1a15-dropgroup.patch
%description
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and
@@ -59,6 +60,7 @@ network.
%patch9 -p1 -b .bogon
%patch10 -p1 -b .extraman
%patch11 -p1 -b .exitcode
+%patch12 -p1 -b .dropgroup
%build
%configure
@@ -151,6 +153,9 @@ fi
%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
%changelog
+* Thu May 31 2012 Aleš Ledvinka <aledvink(a)redhat.com> 14:2.1a15-20
+- fix supplementary group list (#825328) (CVE-2012-2653)
+
* Thu Jan 19 2012 Jan Synáček <jsynacek(a)redhat.com> 14:2.1a15-19
- Turn on PrivateTmp=true in service file (#782477)
11 years, 4 months
[arpwatch/f17] fix supplementary group list (#825328) (CVE-2012-2653)
by aledvink@fedoraproject.org
commit a9b48987471974e5787e94e3447428986743bf06
Author: Ales Ledvinka <aledvink(a)redhat.com>
Date: Thu May 31 17:57:54 2012 +0200
fix supplementary group list (#825328) (CVE-2012-2653)
arpwatch-2.1a15-dropgroup.patch | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/arpwatch-2.1a15-dropgroup.patch b/arpwatch-2.1a15-dropgroup.patch
new file mode 100644
index 0000000..b6a25f8
--- /dev/null
+++ b/arpwatch-2.1a15-dropgroup.patch
@@ -0,0 +1,12 @@
+diff -up arpwatch-2.1a15/arpwatch.c.dropgroup arpwatch-2.1a15/arpwatch.c
+--- arpwatch-2.1a15/arpwatch.c.dropgroup 2012-05-31 11:47:13.327901902 +0200
++++ arpwatch-2.1a15/arpwatch.c 2012-05-31 11:48:04.859900061 +0200
+@@ -147,7 +147,7 @@ void dropprivileges(const char* user)
+ struct passwd* pw;
+ pw = getpwnam( user );
+ if ( pw ) {
+- if ( initgroups(pw->pw_name, NULL) != 0 || setgid(pw->pw_gid) != 0 ||
++ if ( setgid(pw->pw_gid) != 0 || setgroups(0, NULL) != 0 ||
+ setuid(pw->pw_uid) != 0 ) {
+ syslog(LOG_ERR, "Couldn't change to '%.32s' uid=%d gid=%d", user,
+ pw->pw_uid, pw->pw_gid);
11 years, 4 months
[arpwatch/f16] 2.1a15-18
by aledvink@fedoraproject.org
commit 925d651ace887494efc27eed987dc0c1796a3244
Author: Ales Ledvinka <aledvink(a)redhat.com>
Date: Thu May 31 18:14:34 2012 +0200
2.1a15-18
arpwatch.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/arpwatch.spec b/arpwatch.spec
index 1704382..5a693bb 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -3,7 +3,7 @@
Name: arpwatch
Epoch: 14
Version: 2.1a15
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Network monitoring tools for tracking IP addresses on a network
Group: Applications/System
License: BSD with advertising
@@ -34,6 +34,7 @@ Patch8: arpwatch-2.1a15-nolocalpcap.patch
Patch9: arpwatch-2.1a15-bogon.patch
Patch10: arpwatch-2.1a15-extraman.patch
Patch11: arpwatch-exitcode.patch
+Patch12: arpwatch-2.1a15-dropgroup.patch
%description
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and
@@ -59,6 +60,7 @@ network.
%patch9 -p1 -b .bogon
%patch10 -p1 -b .extraman
%patch11 -p1 -b .exitcode
+%patch12 -p1 -b .dropgroup
%build
%configure
@@ -151,6 +153,9 @@ fi
%verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
%changelog
+* Thu May 31 2012 Aleš Ledvinka <aledvink(a)redhat.com> 14:2.1a15-18
+- fix supplementary group list (#825328) (CVE-2012-2653)
+
* Fri Jul 08 2011 Miroslav Lichvar <mlichvar(a)redhat.com> 14:2.1a15-17
- exit with zero error code (#699285)
- change service type to forking (#699285)
11 years, 4 months