gmane.linux.redhat.fedora.extras.cvs

[PackageKit] 0.7.4-5

Rex Dieter — 2012-05-25T15:07:46

commit 4913c89ac4eb7686cb869d93278eb431c6c8ff9a
Author: Rex Dieter <rdieter< at >fedoraproject.org>
Date:   Fri May 25 09:59:09 2012 -0500

    0.7.4-5
    
    - re-enable -browser-plugin content
    - make V=1

 PackageKit-0.7.4-xulrunner2.patch |   12 ++++++++++++
 PackageKit.spec                   |   18 ++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/PackageKit-0.7.4-xulrunner2.patch b/PackageKit-0.7.4-xulrunner2.patch
new file mode 100644
index 0000000..fb86fc6
--- /dev/null
+++ b/PackageKit-0.7.4-xulrunner2.patch
< at >< at > -0,0 +1,12 < at >< at >
+diff -up PackageKit-0.7.4/configure.ac.xulrunner2 PackageKit-0.7.4/configure.ac
+--- PackageKit-0.7.4/configure.ac.xulrunner22012-04-24 03:27:24.000000000 -0500
++++ PackageKit-0.7.4/configure.ac2012-05-25 09:15:04.170891611 -0500
+< at >< at > -349,7 +349,7 < at >< at > AC_ARG_ENABLE(browser_plugin, AS_HELP_ST
+       enable_browser_plugin=$enableval,enable_browser_plugin=yes)
+ if test x$enable_browser_plugin = xyes; then
+ PKG_CHECK_MODULES(PK_BROWSER_PLUGIN,\
+-  mozilla-plugin >= 8.0\
++  mozilla-plugin >= 2\
+   gio-unix-2.0\
+   nspr >= 4.8\
+   cairo\
diff --git a/PackageKit.spec b/PackageKit.spec
index 60ac503..11c19bb 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
< at >< at > -3,7 +3,7 < at >< at >
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.7.4
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
< at >< at > -20,6 +20,9 < at >< at > Patch2:    PackageKit-0.7.4-yum-untrusted.patch
 # Upstreamed: fix an obvious off-by-one when parsing the signature
 Patch3:    0001-Fix-importing-GPG-signatures.patch
 
+# Upstreamable?  allow use of xulrunner2 for browser-plugin support
+Patch4: PackageKit-0.7.4-xulrunner2.patch
+
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-backend
 Requires: shared-mime-info
< at >< at > -28,6 +31,8 < at >< at > Requires: comps-extras
 Requires: preupgrade
 %endif
 
+# required by patch4
+BuildRequires: automake libtool
 BuildRequires: glib2-devel >= 2.16.1
 BuildRequires: dbus-devel  >= 1.1.1
 BuildRequires: dbus-glib-devel >= 0.74
< at >< at > -254,6 +259,8 < at >< at > user to restart the computer or remove and re-insert the device.
 %patch1 -p1 -b .no-time
 %patch2 -p1 -b .yum-untrusted
 %patch3 -p1 -b .fix-install-signature
+%patch4 -p1 -b .xulrunner2
+NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure \
< at >< at > -269,7 +276,7 < at >< at > user to restart the computer or remove and re-insert the device.
         --disable-strict \
         --disable-tests
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
< at >< at > -407,8 +414,7 < at >< at > update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files browser-plugin
 %defattr(-,root,root,-)
-#%{_libdir}/mozilla/plugins/packagekit-plugin.so
-# FIXME: F17 doesn't have a new enough npapi package
+%{_libdir}/mozilla/plugins/packagekit-plugin.so
 
 %files gstreamer-plugin
 %defattr(-,root,root,-)
< at >< at > -458,6 +464,10 < at >< at > update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Fri May 25 2012 Rex Dieter <rdieter< at >fedoraproject.org> 0.7.4-5
+- re-enable -browser-plugin content
+- make V=1
+
 * Thu May 17 2012 Richard Hughes  <rhughes< at >redhat.com> - 0.7.4-4
 - Fix an obvious off-by-one when parsing the signature
 - Resolves: #794927

[PackageKit] Fix an obvious off-by-one when parsing the signature

Rex Dieter — 2012-05-25T15:07:41

commit 78752a8536cfd72bce020793cea1df52dcf4084f
Author: Richard Hughes <richard< at >hughsie.com>
Date:   Thu May 17 10:34:32 2012 +0100

    Fix an obvious off-by-one when parsing the signature
    
    - Resolves: #794927
    
    Conflicts:
    PackageKit.spec

 0001-Fix-importing-GPG-signatures.patch |   34 +++++++++++++++++++++++++++++++
 PackageKit.spec                         |   10 ++++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-importing-GPG-signatures.patch b/0001-Fix-importing-GPG-signatures.patch
new file mode 100644
index 0000000..4f7fd6a
--- /dev/null
+++ b/0001-Fix-importing-GPG-signatures.patch
< at >< at > -0,0 +1,34 < at >< at >
+From 8380d8e0f91fc781919cbab68ba410c347cef0c2 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard< at >hughsie.com>
+Date: Thu, 17 May 2012 10:28:00 +0100
+Subject: [PATCH] Fix importing GPG signatures
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=794927
+---
+ lib/packagekit-glib2/pk-client.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
+index 6706331..d38c7b4 100644
+--- a/lib/packagekit-glib2/pk-client.c
++++ b/lib/packagekit-glib2/pk-client.c
+< at >< at > -1323,11 +1323,11 < at >< at > pk_client_signal_cb (GDBusProxy *proxy,
+       "package-id", tmp_str[0],
+       "repository-name", tmp_str[1],
+       "key-url", tmp_str[2],
+-      "key-userid", tmp_str[2],
+-      "key-id", tmp_str[3],
+-      "key-fingerprint", tmp_str[4],
+-      "key-timestamp", tmp_str[5],
+-      "type", pk_sig_type_enum_from_string (tmp_str[6]),
++      "key-userid", tmp_str[3],
++      "key-id", tmp_str[4],
++      "key-fingerprint", tmp_str[5],
++      "key-timestamp", tmp_str[6],
++      "type", pk_sig_type_enum_from_string (tmp_str[7]),
+       "role", state->role,
+       "transaction-id", state->transaction_id,
+       NULL);
+-- 
+1.7.10.1
+
diff --git a/PackageKit.spec b/PackageKit.spec
index 97dc1bc..60ac503 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
< at >< at > -3,7 +3,7 < at >< at >
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.7.4
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
< at >< at > -17,6 +17,9 < at >< at > Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 # Upstreamed: don't perceive all updates as untrusted
 Patch2:    PackageKit-0.7.4-yum-untrusted.patch
 
+# Upstreamed: fix an obvious off-by-one when parsing the signature
+Patch3:    0001-Fix-importing-GPG-signatures.patch
+
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-backend
 Requires: shared-mime-info
< at >< at > -250,6 +253,7 < at >< at > user to restart the computer or remove and re-insert the device.
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 %patch2 -p1 -b .yum-untrusted
+%patch3 -p1 -b .fix-install-signature
 
 %build
 %configure \
< at >< at > -454,6 +458,10 < at >< at > update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Thu May 17 2012 Richard Hughes  <rhughes< at >redhat.com> - 0.7.4-4
+- Fix an obvious off-by-one when parsing the signature
+- Resolves: #794927
+
 * Fri May 11 2012 Nils Philippsen <nils< at >redhat.com> - 0.7.4-3
 - yum: don't perceive all updates as untrusted (#821015)

[python-crypto] Created tag python-crypto-2.0.1-5.el5

Paul Howarth — 2012-05-25T15:06:17

The lightweight tag 'python-crypto-2.0.1-5.el5' was created pointing to:

 38bbfd9... Fix insecure ElGamal key generation (#825165, CVE-2012-2417

[honeyd/f17] (2 commits) ...Build fix?

Peter Robinson — 2012-05-25T15:05:37

Summary of changes:

  c25d0de... Migrate to systemd. (*)
  061ee68... Build fix? (*)

(*) This commit already existed in another branch; no separate mail sent

[ding-libs] Bumped the release number to 9 for smooth upgrade

Jan Zeleny — 2012-05-25T15:04:09

commit aacfc10bbb5ee8670b360986278ec7c9acff4760
Author: Jan Zeleny <jzeleny< at >redhat.com>
Date:   Fri May 25 17:03:55 2012 +0200

    Bumped the release number to 9 for smooth upgrade

 ding-libs.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/ding-libs.spec b/ding-libs.spec
index 3b6c5d3..e8feb2a 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
< at >< at > -1,6 +1,6 < at >< at >
 Name: ding-libs
 Version: 0.2.91
-Release: 1%{?dist}
+Release: 9%{?dist}
 Summary: "Ding is not GLib" assorted utility libraries
 Group: Development/Libraries
 License: LGPLv3+
< at >< at > -318,6 +318,9 < at >< at > rm -f */doc/html/installdox
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 25 2012 Jan Zeleny <jzeleny< at >redhat.com> - 0.2.91-9
+- Bumped the release number to 9 for smooth upgrade
+
 * Fri May 25 2012 Jan Zeleny <jzeleny< at >redhat.com> - 0.2.91-1
 - Rebase to 0.3.0beta1, changelog available at
   https://fedorahosted.org/sssd/wiki/Releases/DingNotes-0.2.91

[python-crypto/el5] Fix insecure ElGamal key generation (#825165,CVE-2012-2417)

Paul Howarth — 2012-05-25T15:00:02

commit 38bbfd9677fac0845e903abd200de1119b5558ee
Author: Paul Howarth <paul< at >city-fan.org>
Date:   Fri May 25 14:55:03 2012 +0100

    Fix insecure ElGamal key generation (#825165, CVE-2012-2417)
    
    - Fix LP#985164: insecure ElGamal key generation (#825165, CVE-2012-2417)
    - Update URL
    - Fix shellbangs and permissions of installed files

 .gitignore                         |    3 +-
 pycrypto-2.0.1-CVE-2012-2417.patch |   90 ++++++++++++++++++++++++++++++++++++
 python-crypto.spec                 |   39 ++++++++++++----
 3 files changed, 120 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc34bf7..0452e1b 100644
--- a/.gitignore
+++ b/.gitignore
< at >< at > -1,2 +1 < at >< at >
-pycrypto-2.0.1.tar.gz
-/pycrypto-2.0.1-hobbled.tar.gz
+/pycrypto-[0-9.-]*.tar.gz
diff --git a/pycrypto-2.0.1-CVE-2012-2417.patch b/pycrypto-2.0.1-CVE-2012-2417.patch
new file mode 100644
index 0000000..364caa7
--- /dev/null
+++ b/pycrypto-2.0.1-CVE-2012-2417.patch
< at >< at > -0,0 +1,90 < at >< at >
+--- PublicKey/ElGamal.py
++++ PublicKey/ElGamal.py
+< at >< at > -25,39 +25,54 < at >< at >
+     Generate an ElGamal key of length 'bits', using 'randfunc' to get
+     random data and 'progress_func', if present, to display
+     the progress of the key generation.
++
++    The key will be safe for use for both encryption and signature
++    (although it should be used for **only one** purpose).
++
+     """
+     obj=ElGamalobj()
+-    # Generate prime p
++    # Generate a safe prime p
++    # See Algorithm 4.86 in Handbook of Applied Cryptography
+     if progress_func:
+         progress_func('p\n')
+-    obj.p=bignum(getPrime(bits, randfunc))
+-    # Generate random number g
++    while 1:
++        q = bignum(getPrime(bits-1, randfunc))
++        obj.p = 2*q+1
++        if number.isPrime(obj.p, randfunc=randfunc):
++            break
++    # Generate generator g
++    # See Algorithm 4.80 in Handbook of Applied Cryptography
++    # Note that the order of the group is n=p-1=2q, where q is prime
+     if progress_func:
+         progress_func('g\n')
+-    size=bits-1-(ord(randfunc(1)) & 63) # g will be from 1--64 bits smaller than p
+-    if size<1:
+-        size=bits-1
+-    while (1):
+-        obj.g=bignum(getPrime(size, randfunc))
+-        if obj.g < obj.p:
++    while 1:
++        # We must avoid g=2 because of Bleichenbacher's attack described
++        # in "Generating ElGamal signatures without knowning the secret key",
++        # 1996
++        #
++        obj.g = number.getRandomRange(3, obj.p, randfunc)
++        safe = 1
++        if pow(obj.g, 2, obj.p)==1:
++            safe=0
++        if safe and pow(obj.g, q, obj.p)==1:
++            safe=0
++        # Discard g if it divides p-1 because of the attack described
++        # in Note 11.67 (iii) in HAC
++        if safe and divmod(obj.p-1, obj.g)[1]==0:
++            safe=0
++        # g^{-1} must not divide p-1 because of Khadir's attack
++        # described in "Conditions of the generator for forging ElGamal
++        # signature", 2011
++        ginv = number.inverse(obj.g, obj.p)
++        if safe and divmod(obj.p-1, ginv)[1]==0:
++            safe=0
++        if safe:
+             break
+-        size=(size+1) % bits
+-        if size==0:
+-            size=4
+-    # Generate random number x
++    # Generate private key x
+     if progress_func:
+         progress_func('x\n')
+-    while (1):
+-        size=bits-1-ord(randfunc(1)) # x will be from 1 to 256 bits smaller than p
+-        if size>2:
+-            break
+-    while (1):
+-        obj.x=bignum(getPrime(size, randfunc))
+-        if obj.x < obj.p:
+-            break
+-        size = (size+1) % bits
+-        if size==0:
+-            size=4
++    obj.x=number.getRandomRange(2, obj.p-1, randfunc)
++    # Generate public key y
+     if progress_func:
+         progress_func('y\n')
+     obj.y = pow(obj.g, obj.x, obj.p)
+< at >< at > -105,6 +120,8 < at >< at >
+         return (a, b)
+ 
+     def _verify(self, M, sig):
++        if sig[0]<1 or sig[0]>p-1:
++            return 0
+         v1=pow(self.y, sig[0], self.p)
+         v1=(v1*pow(sig[0], sig[1], self.p)) % self.p
+         v2=pow(self.g, M, self.p)
diff --git a/python-crypto.spec b/python-crypto.spec
index de3804e..a27dfe6 100644
--- a/python-crypto.spec
+++ b/python-crypto.spec
< at >< at > -4,10 +4,10 < at >< at >
 Summary:Cryptography library for Python
 Name:python-crypto
 Version:2.0.1
-Release:4%{?dist}.2
+Release:5%{?dist}
 License:Public Domain
 Group:Development/Libraries
-URL:http://www.amk.ca/python/code/crypto.html
+URL:http://www.pycrypto.org/
 
 # The original tarball:
 #  http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz
< at >< at > -18,10 +18,14 < at >< at > Source:pycrypto-2.0.1-hobbled.tar.gz
 
 # patch taken from 
 # http://gitweb2.dlitz.net/?p=crypto/pycrypto-2.x.git;a=commitdiff;h=d1c4875e1f220652fe7ff8358f56dee3b2aba31b
-Patch0: %{name}-fix_buffer_overflow.patch
+Patch0:%{name}-fix_buffer_overflow.patch
 
 # Remove references to IDEA and RC5:
-Patch1:         python-crypto-hobble.patch
+Patch1:python-crypto-hobble.patch
+
+# Backport to pycrypto 2.0.1 of:
+# https://github.com/Legrandin/pycrypto/commit/9f912f13df99ad3421eff360d6a62d7dbec755c2
+Patch2:pycrypto-2.0.1-CVE-2012-2417.patch
 
 BuildRequires:python >= 2.2
 BuildRequires:python-devel >= 2.2
< at >< at > -38,19 +42,29 < at >< at > SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.).
 
 %prep
 %setup -n pycrypto-%{version} -q
-sed -i s:/lib:/%_lib:g setup.py
+
+# C source should not be executable
+find . -name '*.c' | xargs chmod -c -x
+
+# Remove redundant shellbang
+sed -i -e '/#!\/usr\/local\/bin\/python/d' Util/RFC1751.py
+
+# Fix setup.py for lib64 if necessary
+sed -i -e 's|/lib|/%_lib|g' setup.py
+
 %patch0 -b .patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-find -name "*.py"|xargs %{__perl} -pi -e "s:/usr/local/bin/python:%{__python}:"
 
+# Remove group write permissions on shared objects
+find %{buildroot}%{python_sitearch} -name '*.so' -exec chmod -c g-w {} \;
 
 %check
 %{__python} test.py
< at >< at > -81,15 +95,20 < at >< at > rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 25 2012 Paul Howarth <paul< at >city-fan.org> - 2.0.1-5
+- Fix LP#985164: insecure ElGamal key generation (#825165, CVE-2012-2417)
+- Update URL
+- Fix shellbangs and permissions of installed files
+
 * Wed Sep 22 2010 David Malcolm <dmalcolm< at >redhat.com> - 2.0.1-4.2
 - remove IDEA and RC5 implementations
 - add %%check section
 
 * Fri Feb 13 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.0.1-4.1
 - some improvements from fedora branch
--- add patch to fix #485298 / CVE-2009-0544
--- provide pycrypto
--- drop patch0 and fix libdir handling so it works on more arches than x86_64
+  - add patch to fix #485298 / CVE-2009-0544
+  - provide pycrypto
+  - drop patch0 and fix libdir handling so it works on more arches than x86_64
 
 * Thu Sep 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.0.1-4
 - Don't ghost pyo files (#205408)

[ghc-rpm-macros] add changelog about rename ghc_binlib_package toghc_lib_subpackage

Jens Petersen — 2012-05-25T14:58:26

commit 89972ec7570a64bd627c955d66f1bd77fa647232
Author: Jens Petersen <petersen< at >redhat.com>
Date:   Fri May 25 23:58:01 2012 +0900

    add changelog about rename ghc_binlib_package to ghc_lib_subpackage

 ghc-rpm-macros.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 82d414f..68ec44a 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
< at >< at > -64,6 +64,7 < at >< at > EOF
 - only  build ghci .o library files on ghc_arches_with_ghci
 - support meta packages like haskell-platform without base lib files
 - make it possible not to have to use common_summary and common_description
+- rename ghc_binlib_package to ghc_lib_subpackage
 
 * Mon Mar 19 2012 Jens Petersen <petersen< at >redhat.com> - 0.90-1
 - use new rpm metadata hash format for ghc-7.4

[ghc-rpm-macros] rename ghc_binlib_package to ghc_lib_subpackage;fix new missing end of line backslashes

Jens Petersen — 2012-05-25T14:58:21

commit 8f4190a52c22cee63335d2bb777438f015e488b5
Author: Jens Petersen <petersen< at >redhat.com>
Date:   Fri May 25 23:52:09 2012 +0900

    rename ghc_binlib_package to ghc_lib_subpackage; fix new missing end of line backslashes

 ghc-rpm-macros.ghc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index ff5b0de..fddf790 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
< at >< at > -77,7 +77,7 < at >< at > if [ -d "%{buildroot}%{docdir}" ]; then\
 echo "%{docdir}" >> %{basepkg}-devel.files\
 fi\
 for i in %{!?ghc_without_shared:%{basepkg}.files} %{basepkg}-devel.files; do\
-if [ -f "$i" ];\
+if [ -f "$i" ]; then\
 sed -i -e "s!%{buildroot}!!g" $i\
 fi\
 done\
< at >< at > -146,11 +146,11 < at >< at > Group:          System Environment/Libraries\
 %{common_description}\
 %if %{defined ghc_version} && %{undefined ghc_without_shared}\
 This package provides the shared library.\
-%endif
+%endif\
 %endif
 
-# ghc_binlib_package [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version]
-%ghc_binlib_package(c:h:l:x)\
+# ghc_lib_subpackage [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-x] [name] [version]
+%ghc_lib_subpackage(c:h:l:x)\
 %define pkgname %{?1}%{!?1:%{pkg_name}}\
 %define pkgver %{?2}%{!?2:%{version}}\
 %define pkgnamever %{pkgname}-%{pkgver}\
< at >< at > -211,7 +211,7 < at >< at > Provides:       %{basepkg}-prof = %{pkgver}-%{release}\
 %define pkgname %{?1}%{!?1:%{pkg_name}}\
 %define basepkg ghc-%{pkgname}\
 %description -n %{basepkg}-devel\
-%if %{defined common_description}
+%if %{defined common_description}\
 %{common_description}\
 \
 This package contains the development files.\

[python-crypto] Created tag python-crypto-2.3-6.fc16

Paul Howarth — 2012-05-25T14:54:56

The lightweight tag 'python-crypto-2.3-6.fc16' was created pointing to:

 9426659... Fix insecure ElGamal key generation (#825164, CVE-2012-2417

[python-crypto] Created tag python-crypto-2.3-6.fc15

Paul Howarth — 2012-05-25T14:54:51

The lightweight tag 'python-crypto-2.3-6.fc15' was created pointing to:

 9426659... Fix insecure ElGamal key generation (#825164, CVE-2012-2417

[mercurial] oops

Neal Becker — 2012-05-25T14:49:12

commit 00a5d946a602a4a0bc43398b7fb8e7e83c285577
Author: Neal Becker <ndbecker2< at >gmail.com>
Date:   Fri May 25 10:48:39 2012 -0400

    oops

 mercurial.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index 7cc7a8c..17f1423 100644
--- a/mercurial.spec
+++ b/mercurial.spec
< at >< at > -171,6 +171,7 < at >< at > rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/mercurial
 %{python_sitearch}/hgext
 %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/certs.rc
 
 %files -n emacs-%{pkg}
 %defattr(-,root,root,-)

[nfs-utils] Correctly search for the existence of nfsnobody (bz816149) Correctly change the default group id fo

Steve Dickson — 2012-05-25T14:49:10

commit 40c2a71d4398a48d3b72d662933c980c23a3314e
Author: Steve Dickson <steved< at >redhat.com>
Date:   Fri May 25 10:47:10 2012 -0400

    Correctly search for the existence of nfsnobody (bz 816149)
    Correctly change the default group id for nfsnobody (bz 816149)
    
    Signed-off-by: Steve Dickson <steved< at >redhat.com>

 nfs-utils.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 906b9e5..4aeb8ae 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
< at >< at > -2,7 +2,7 < at >< at > Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.6
-Release: 0%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
< at >< at > -179,7 +179,7 < at >< at > done
 %define nfsnobody_uid   65534
 
 # Create nfsnobody gid as long as it does not already exist
-cat /etc/group | cut -d':' -f 3 | grep --quiet %{nfsnobody_uid} 2>/dev/null
+cat /etc/group | cut -d':' -f 3 | grep --quiet nfsnobody 2>/dev/null
 if [ "$?" -eq 1 ]; then
     /usr/sbin/groupadd -g %{nfsnobody_uid} nfsnobody 2>/dev/null || :
 else
< at >< at > -187,13 +187,13 < at >< at > else
 fi
 
 # Create nfsnobody uid as long as it does not already exist.
-cat /etc/passwd | cut -d':' -f 3 | grep --quiet %{nfsnobody_uid} 2>/dev/null
+cat /etc/passwd | cut -d':' -f 3 | grep --quiet nfsnobody 2>/dev/null
 if [ "$?" -eq 1 ]; then
     /usr/sbin/useradd -l -c "Anonymous NFS User" -r -g %{nfsnobody_uid} \
         -s /sbin/nologin -u %{nfsnobody_uid} -d /var/lib/nfs nfsnobody 2>/dev/null || :
 else
 
-   /usr/sbin/usermod -u %{nfsnobody_uid} nfsnobody 2>/dev/null || :
+   /usr/sbin/usermod -u %{nfsnobody_uid} -g %{nfsnobody_uid} nfsnobody 2>/dev/null || :
 fi
 
 %post
< at >< at > -293,6 +293,10 < at >< at > fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri May 25 2012 Steve Dickson <steved< at >redhat.com> 1.2.6-1
+- Correctly search for the existence of nfsnobody (bz 816149)
+- Correctly change the default group id for nfsnobody (bz 816149)
+
 * Tue May 15 2012 Steve Dickson <steved< at >redhat.com> 1.2.6-0
 - Update to the latest upstream release: nfs-utils-1.2.6 (bz 821673)
 - Split out NFS server daemons into individual service files (bz 769879)

[mercurial] Add certs.rc

Neal Becker — 2012-05-25T14:49:07

commit 99d70103154b4791b06cb44474562a39eb68ac5d
Author: Neal Becker <ndbecker2< at >gmail.com>
Date:   Fri May 25 10:46:42 2012 -0400

    Add certs.rc

 mercurial.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index 8078ec8..7cc7a8c 100644
--- a/mercurial.spec
+++ b/mercurial.spec
< at >< at > -3,7 +3,7 < at >< at >
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 1.rc1%{?dist}
 
 #%define upstreamversion %{version}-rc
< at >< at > -136,6 +136,12 < at >< at > path=%{_libexecdir}/mercurial/hgk
 EOF
 install -m 644 hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
+cat > certs.rc <<EOF
+[web]
+cacerts = /etc/pki/tls/certs/ca-bundle.crt
+EOF
+install -m 644 certs.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
+
 install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 mv $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
< at >< at > -184,6 +190,9 < at >< at > rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Fri May 25 2012 Neal Becker <ndbecker2< at >gmail.com> - 2.2.1-2
+- Add certs.rc
+
 * Fri May  4 2012 Neal Becker <ndbecker2< at >gmail.com> - 2.2.1-1
 - update to 2.2.1

[ding-libs] Rebased to 0.3.0beta 1 (0.2.91)

Jan Zeleny — 2012-05-25T14:48:28

commit 45eb77c6dbe3d34a21fb481b88063990729fd0f3
Author: Jan Zeleny <jzeleny< at >redhat.com>
Date:   Fri May 25 16:46:49 2012 +0200

    Rebased to 0.3.0beta 1 (0.2.91)
    
    Changelog available at
    https://fedorahosted.org/sssd/wiki/Releases/DingNotes-0.2.91

 .gitignore                                         |    1 +
 ...ls-handle-off-by-one-error-in-path_concat.patch |   62 --------
 0002-path_utils-Handle-in-path_concat.patch        |   62 --------
 ...path_concat-should-return-empty-string-on.patch |  153 --------------------
 ding-libs.spec                                     |   61 ++++++--
 sources                                            |    2 +-
 6 files changed, 50 insertions(+), 291 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9634b65..9c366d9 100644
--- a/.gitignore
+++ b/.gitignore
< at >< at > -1,2 +1,3 < at >< at >
 /ding-libs-0.1.2.tar.gz
 /ding-libs-0.1.3.tar.gz
+/ding-libs-0.2.91.tar.gz
diff --git a/ding-libs.spec b/ding-libs.spec
index 0b47704..3b6c5d3 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
< at >< at > -1,6 +1,6 < at >< at >
 Name: ding-libs
-Version: 0.1.3
-Release: 8%{?dist}
+Version: 0.2.91
+Release: 1%{?dist}
 Summary: "Ding is not GLib" assorted utility libraries
 Group: Development/Libraries
 License: LGPLv3+
< at >< at > -10,16 +10,12 < at >< at > BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %global path_utils_version 0.2.1
 %global dhash_version 0.4.3
-%global collection_version 0.6.1
-%global ref_array_version 0.1.2
-%global ini_config_version 0.6.2
+%global collection_version 0.6.2
+%global ref_array_version 0.1.3
+%global ini_config_version 0.7.0
 
 ### Patches ###
 
-Patch0001: 0001-path_utils-handle-off-by-one-error-in-path_concat.patch
-Patch0002: 0002-path_utils-Handle-in-path_concat.patch
-Patch0003: 0003-path_utils-path_concat-should-return-empty-string-on.patch
-
 ### Dependencies ###
 
 ### Build Dependencies ###
< at >< at > -203,6 +199,45 < at >< at > A dynamically-growing, reference-counted array
 
 
 ##############################################################################
+# basicobjects
+##############################################################################
+
+%package -n libbasicobjects
+Summary: Basic object types for C
+Group: Development/Libraries
+License: GPLv3+
+Version: %{basicobjects_version}
+
+%description -n libbasicobjects
+Basic object types
+
+%package -n libbasicobjects-devel
+Summary: Development files for libbasicobjects
+Group: Development/Libraries
+License: GPLv3+
+Version: %{basicobjects_version}
+Requires: libbasicobjects = %{basicobjects_version}-%{release}
+
+%description -n libbasicobjects-devel
+Basic object types
+
+%post -n libbasicobjects -p /sbin/ldconfig
+%postun -n libbasicobjects -p /sbin/ldconfig
+
+%files -n libbasicobjects
+%defattr(-,root,root,-)
+%doc COPYING
+%doc COPYING.LESSER
+%{_libdir}/libbasicobjects.so.0
+%{_libdir}/libbasicobjects.so.0.0.0
+
+%files -n libbasicobjects-devel
+%defattr(-,root,root,-)
+%{_includedir}/simplebuffer.h
+%{_libdir}/libbasicobjects.so
+%{_libdir}/pkgconfig/basicobjects.pc
+
+##############################################################################
 # ini_config
 ##############################################################################
 
< at >< at > -251,10 +286,6 < at >< at > structure
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %build
 %configure \
     --disable-static
< at >< at > -287,6 +318,10 < at >< at > rm -f */doc/html/installdox
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 25 2012 Jan Zeleny <jzeleny< at >redhat.com> - 0.2.91-1
+- Rebase to 0.3.0beta1, changelog available at
+  https://fedorahosted.org/sssd/wiki/Releases/DingNotes-0.2.91
+
 * Tue Mar 06 2012 Stephen Gallagher <sgallagh< at >redhat.com> - 0.1.3-8
 - Make path_concat return empty string on ENOBUFS
 
diff --git a/sources b/sources
index 26e72b6..ab59ea1 100644
--- a/sources
+++ b/sources
< at >< at > -1 +1 < at >< at >
-b4f5e03b0b1bd0ab765902a7a466f749  ding-libs-0.1.3.tar.gz
+7d9306ea4f0c2d6ef657c772abd2a8fd  ding-libs-0.2.91.tar.gz

[python-crypto/f15] (2 commits) ...Fix insecure ElGamal keygeneration (#825164, CVE-2012-2417)

Paul Howarth — 2012-05-25T14:44:56

Summary of changes:

  dd5125f... Rebuild with re-rolled upstream tarball (*)
  9426659... Fix insecure ElGamal key generation (#825164, CVE-2012-2417 (*)

(*) This commit already existed in another branch; no separate mail sent

[grilo] Use GTK+ 3.0 for the test UI

Bastien Nocera — 2012-05-25T14:40:46

commit c93e1fe36d721f1613080ae27cd9561b86d8cafc
Author: Bastien Nocera <hadess< at >hadess.net>
Date:   Fri May 25 15:40:42 2012 +0100

    Use GTK+ 3.0 for the test UI

 grilo.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/grilo.spec b/grilo.spec
index 0eba038..aa43b63 100644
--- a/grilo.spec
+++ b/grilo.spec
< at >< at > -16,7 +16,7 < at >< at > BuildRequires:  gobject-introspection-devel >= 0.9.0
 BuildRequires:  libxml2-devel
 BuildRequires:  libsoup-devel
 # For the test UI
-BuildRequires:  gtk2-devel GConf2-devel
+BuildRequires:  gtk3-devel
 
 Requires:       gobject-introspection

[fence-virt/f16] Add qpid build patch from upstream

Ryan McCabe — 2012-05-25T14:37:49

commit fcfc2d175cd911b1421beb3124075e696651835d
Author: Ryan McCabe <rmccabe< at >redhat.com>
Date:   Fri May 25 10:37:35 2012 -0400

    Add qpid build patch from upstream

 qpid-build.patch |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/qpid-build.patch b/qpid-build.patch
new file mode 100644
index 0000000..76d9d26
--- /dev/null
+++ b/qpid-build.patch
< at >< at > -0,0 +1,22 < at >< at >
+commit 2f87331c1aff9e7e7a2757fce6487c47789ec209
+Author: Lon Hohberger <lon< at >users.sourceforge.net>
+Date:   Mon Mar 26 17:12:49 2012 -0400
+
+    Stop linking against unnecessary QPid libs.
+    
+    Signed-off-by: Lon Hohberger <lon< at >users.sourceforge.net>
+
+diff --git a/server/Makefile.in b/server/Makefile.in
+index 2c989ed..2bd55ca 100644
+--- a/server/Makefile.in
++++ b/server/Makefile.in
+< at >< at > -27,7 +27,8 < at >< at > PACEMAKER_LIBS=-lcib -lcrmcommon -lpe_status -lplumb \
+ PACEMAKER_INCLUDES=`pkg-config --cflags glib-2.0` -I/usr/include/pacemaker -I/usr/include/heartbeat
+ CMAN_LIBS=-lcman
+ VIRT_LIBS=-lvirt
+-VIRT_QPID=-lqmf2 -lqpidclient -lqpidtypes -lqpidcommon -lqpidmessaging
++VIRT_QPID=-lqmf2
++# No longer needed: -lqpidclient -lqpidtypes -lqpidcommon -lqpidmessaging
+ NSS_LIBS=-lnss3
+ XML_LIBS=`xml2-config --libs`
+ INCLUDES=-I../include `nss-config --cflags` `nspr-config --cflags` `xml2-config --cflags`

[python-crypto/f16] Fix insecure ElGamal key generation (#825164,CVE-2012-2417)

Paul Howarth — 2012-05-25T14:36:16

commit 9426659d313912882ed3a53d2adb85996ca6597d
Author: Paul Howarth <paul< at >city-fan.org>
Date:   Fri May 25 15:35:15 2012 +0100

    Fix insecure ElGamal key generation (#825164, CVE-2012-2417)

 pycrypto-2.3-CVE-2012-2417.patch |   90 ++++++++++++++++++++++++++++++++++++++
 python-crypto.spec               |   11 ++++-
 2 files changed, 100 insertions(+), 1 deletions(-)
---
diff --git a/pycrypto-2.3-CVE-2012-2417.patch b/pycrypto-2.3-CVE-2012-2417.patch
new file mode 100644
index 0000000..afdc39a
--- /dev/null
+++ b/pycrypto-2.3-CVE-2012-2417.patch
< at >< at > -0,0 +1,90 < at >< at >
+--- lib/Crypto/PublicKey/ElGamal.py
++++ lib/Crypto/PublicKey/ElGamal.py
+< at >< at > -38,39 +38,54 < at >< at >
+     Generate an ElGamal key of length 'bits', using 'randfunc' to get
+     random data and 'progress_func', if present, to display
+     the progress of the key generation.
++
++    The key will be safe for use for both encryption and signature
++    (although it should be used for **only one** purpose).
++
+     """
+     obj=ElGamalobj()
+-    # Generate prime p
++    # Generate a safe prime p
++    # See Algorithm 4.86 in Handbook of Applied Cryptography
+     if progress_func:
+         progress_func('p\n')
+-    obj.p=bignum(getPrime(bits, randfunc))
+-    # Generate random number g
++    while 1:
++        q = bignum(getPrime(bits-1, randfunc))
++        obj.p = 2*q+1
++        if number.isPrime(obj.p, randfunc=randfunc):
++            break
++    # Generate generator g
++    # See Algorithm 4.80 in Handbook of Applied Cryptography
++    # Note that the order of the group is n=p-1=2q, where q is prime
+     if progress_func:
+         progress_func('g\n')
+-    size=bits-1-(ord(randfunc(1)) & 63) # g will be from 1--64 bits smaller than p
+-    if size<1:
+-        size=bits-1
+-    while (1):
+-        obj.g=bignum(getPrime(size, randfunc))
+-        if obj.g < obj.p:
++    while 1:
++        # We must avoid g=2 because of Bleichenbacher's attack described
++        # in "Generating ElGamal signatures without knowning the secret key",
++        # 1996
++        #
++        obj.g = number.getRandomRange(3, obj.p, randfunc)
++        safe = 1
++        if pow(obj.g, 2, obj.p)==1:
++            safe=0
++        if safe and pow(obj.g, q, obj.p)==1:
++            safe=0
++        # Discard g if it divides p-1 because of the attack described
++        # in Note 11.67 (iii) in HAC
++        if safe and divmod(obj.p-1, obj.g)[1]==0:
++            safe=0
++        # g^{-1} must not divide p-1 because of Khadir's attack
++        # described in "Conditions of the generator for forging ElGamal
++        # signature", 2011
++        ginv = number.inverse(obj.g, obj.p)
++        if safe and divmod(obj.p-1, ginv)[1]==0:
++            safe=0
++        if safe:
+             break
+-        size=(size+1) % bits
+-        if size==0:
+-            size=4
+-    # Generate random number x
++    # Generate private key x
+     if progress_func:
+         progress_func('x\n')
+-    while (1):
+-        size=bits-1-ord(randfunc(1)) # x will be from 1 to 256 bits smaller than p
+-        if size>2:
+-            break
+-    while (1):
+-        obj.x=bignum(getPrime(size, randfunc))
+-        if obj.x < obj.p:
+-            break
+-        size = (size+1) % bits
+-        if size==0:
+-            size=4
++    obj.x=number.getRandomRange(2, obj.p-1, randfunc)
++    # Generate public key y
+     if progress_func:
+         progress_func('y\n')
+     obj.y = pow(obj.g, obj.x, obj.p)
+< at >< at > -118,6 +133,8 < at >< at >
+         return (a, b)
+ 
+     def _verify(self, M, sig):
++        if sig[0]<1 or sig[0]>p-1:
++            return 0
+         v1=pow(self.y, sig[0], self.p)
+         v1=(v1*pow(sig[0], sig[1], self.p)) % self.p
+         v2=pow(self.g, M, self.p)
diff --git a/python-crypto.spec b/python-crypto.spec
index 5248ab6..7737330 100644
--- a/python-crypto.spec
+++ b/python-crypto.spec
< at >< at > -4,7 +4,7 < at >< at >
 Summary:Cryptography library for Python
 Name:python-crypto
 Version:2.3
-Release:5%{?dist}
+Release:6%{?dist}
 # Mostly Public Domain apart from parts of HMAC.py and setup.py, which are Python
 License:Public Domain and Python
 Group:Development/Libraries
< at >< at > -12,6 +12,7 < at >< at > URL:http://www.pycrypto.org/
 Source0:http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-%{version}.tar.gz
 Patch0:python-crypto-2.2-optflags.patch
 Patch1:pycrypto-2.3-lib64.patch
+Patch2:pycrypto-2.3-CVE-2012-2417.patch
 Provides:pycrypto = %{version}-%{release}
 BuildRequires:python2-devel >= 2.2, gmp-devel >= 4.1
 BuildRoot:%{_tmppath}/%{name}-%{version}-buildroot-%(id -nu)
< at >< at > -35,6 +36,11 < at >< at > SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.).
 %patch1 -p1
 %endif
 
+# Fix for insecure ElGamal key generation
+# Backport to pycrypto 2.3 of:
+# https://github.com/Legrandin/pycrypto/commit/9f912f13df99ad3421eff360d6a62d7dbec755c2
+%patch2
+
 # Remove spurious shellbangs
 sed -i -e '\|^#!/usr/local/bin/python| d' lib/Crypto/Util/RFC1751.py
 
< at >< at > -73,6 +79,9 < at >< at > rm -rf %{buildroot}
 %{python_sitearch}/Crypto/
 
 %changelog
+* Fri May 25 2012 Paul Howarth <paul< at >city-fan.org> - 2.3-6
+- Fix insecure ElGamal key generation (#825164, CVE-2012-2417)
+
 * Wed May 11 2011 Paul Howarth <paul< at >city-fan.org> - 2.3-5
 - Upstream rolled new tarball with top-level directory restored
 - Nobody else likes macros for commands

[fence-virt/f16] Rebase to fence-virt-0.3.0

Ryan McCabe — 2012-05-25T14:36:05

commit b7a8c20c7648c7ecf65be15c15df8ee76f22cb6b
Author: Ryan McCabe <rmccabe< at >redhat.com>
Date:   Fri May 18 15:52:54 2012 -0400

    Rebase to fence-virt-0.3.0

 .gitignore      |    1 +
 fence-virt.spec |   98 ++++++++++++++++++++++++++++++++++++-------------------
 sources         |    2 +-
 3 files changed, 66 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 702e4f4..5c90a14 100644
--- a/.gitignore
+++ b/.gitignore
< at >< at > -4,3 +4,4 < at >< at > fence-virt-0.2.tar.gz
 fence-virt-0.2.1.tar.gz
 /fence-virt-0.2.2.tar.gz
 /fence-virt-0.2.3.tar.gz
+/fence-virt-0.3.0.tar.gz
diff --git a/fence-virt.spec b/fence-virt.spec
index 5fcb42d..5c8b6ed 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
< at >< at > -1,19 +1,28 < at >< at >
 Name:fence-virt
-Version:0.2.3
-Release:2%{?dist}
+Version:0.3.0
+Release:1%{?dist}
 Summary:A pluggable fencing framework for virtual machines
 Group:System Environment/Base
 License:GPLv2+
-URL:http://voxel.dl.sourceforge.net/project/fence-virt/fence-virt-%{version}.tar.gz
-Source0:%{name}-%{version}.tar.gz
+URL:http://fence-virt.sourceforge.net
+Source0:http://voxel.dl.sourceforge.net/project/fence-virt/%{name}-%{version}.tar.gz
+Patch0: qpid-build.patch
+
 BuildRoot:%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:corosynclib-devel clusterlib-devel libvirt-devel
-BuildRequires:openaislib-devel qmf-devel qpid-cpp-client-devel
+BuildRequires:corosynclib-devel libvirt-devel
+BuildRequires:qmf-devel qpid-cpp-client-devel
 BuildRequires:automake autoconf libxml2-devel nss-devel nspr-devel
 BuildRequires:flex bison libuuid-devel
+
+BuildRequires: systemd-units
+Requires(post):systemd-sysv systemd-units
+Requires(preun):systemd-units
+Requires(postun):systemd-units
+
 Conflicts:fence-agents < 3.0.5-2
 
+
 %description
 Fencing agent for virtual machines.
 
< at >< at > -60,34 +69,22 < at >< at > virtual machines.  Useful for running a cluster of virtual
 machines on a desktop.
 
 
-%package -n fence-virtd-libvirt-qpid
-Summary:Libvirt-qpid backend for fence-virtd
+%package -n fence-virtd-libvirt-qmf
+Summary:Libvirt-qmf backend for fence-virtd
 Group:System Environment/Base
 Requires:libvirt >= 0.6.0
-Requires:fence-virtd libvirt-qpid
+Requires:fence-virtd libvirt-qmf
+Obsoletes:fence-virtd-libvirt-qpid <= 0.2.3
 
-%description -n fence-virtd-libvirt-qpid
-Provides fence_virtd with a connection to libvirt-qpid to
-fence virtual machines.  Libvirt-qpid provies a QMF model
+%description -n fence-virtd-libvirt-qmf
+Provides fence_virtd with a connection to libvirt-qmf to
+fence virtual machines.  Libvirt-qmf provies a QMFv2 model
 to track VMs across multiple hosts.
 
 
-%package -n fence-virtd-checkpoint
-Summary:Cluster+Libvirt backend for fence-virtd
-Group:System Environment/Base
-Requires:fence-virtd
-
-%description -n fence-virtd-checkpoint
-Provides fence_virtd with a connection to libvirt to fence
-virtual machines.  Utilizes corosync's CPG framework to route
-requests as well as the AIS Checkpoint API to store virtual
-machine states across a cluster and make intelligent decisions
-about whether a virtual machine is running.
-
-
 %prep
 %setup -q
-
+%patch0 -p1 -b .qpid-build
 
 %build
 ./autogen.sh
< at >< at > -98,9 +95,10 < at >< at > make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
-install -m 0755 fence_virtd.init %{buildroot}/%{_sysconfdir}/rc.d/init.d/fence_virtd
 
+# Systemd unit file
+mkdir -p %{buildroot}/%{_unitdir}/
+install -m 0644 fence_virtd.service %{buildroot}/%{_unitdir}/
 
 %clean
 rm -rf %{buildroot}
< at >< at > -114,13 +112,44 < at >< at > rm -rf %{buildroot}
 %{_mandir}/man8/fence_virt.*
 %{_mandir}/man8/fence_xvm.*
 
+
 %post
 ccs_update_schema > /dev/null 2>&1 ||:
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable fence_virtd.service &> /dev/null || :
+    /bin/systemctl stop fence_virtd.service &> /dev/null || :
+fi
+
+%postun
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+/bin/systemctl daemon-reload &> /dev/null || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart fence_virtd.service &> /dev/null || :
+fi
+
+
+%triggerun -- fence_virtd < 0.3.0-1
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Packages_migrating_to_a_systemd_unit_file_from_a_SysV_initscript
+/usr/bin/systemd-sysv-convert --save fence_virtd &> /dev/null || :
+/sbin/chkconfig --del fence_virtd &> /dev/null || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl try-restart fence_virtd.service &> /dev/null || :
+
 
 %files -n fence-virtd
 %defattr(-,root,root,-)
 %{_sbindir}/fence_virtd
-%{_sysconfdir}/rc.d/init.d/fence_virtd
+%{_unitdir}/fence_virtd.service
 %config(noreplace) %{_sysconfdir}/fence_virt.conf
 %dir %{_libdir}/%{name}
 %{_mandir}/man5/fence_virt.conf.*
< at >< at > -138,15 +167,16 < at >< at > ccs_update_schema > /dev/null 2>&1 ||:
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libvirt.so
 
-%files -n fence-virtd-libvirt-qpid
+%files -n fence-virtd-libvirt-qmf
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/libvirt-qpid.so
+%{_libdir}/%{name}/libvirt-qmf.so
 
-%files -n fence-virtd-checkpoint
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/checkpoint.so
 
 %changelog
+* Fri May 18 2012 Ryan McCabe <rmccabe< at >fedoraproject.org> 0.3.0-1
+- Rebase from upstream to 0.3.0
+- Add QPid build fix patch from upstream.
+
 * Fri Jul  8 2011 Fabio M. Di Nitto <fdinitto< at >redhat.com> - 0.2.3-2
 - add post call to fence-virt to integrate with cluster 3.1.4
 
diff --git a/sources b/sources
index ae07c3d..fcb37c8 100644
--- a/sources
+++ b/sources
< at >< at > -1 +1 < at >< at >
-84269c1caf97e9b2091bacda3596bd33  fence-virt-0.2.3.tar.gz
+36057fa04a5a9469b0883782862ea04e  fence-virt-0.3.0.tar.gz

[kde-settings/f17] rhel/fedora condtion

Than Ngo — 2012-05-25T14:35:57

Summary of changes:

  8916e61... rhel/fedora condtion (*)

(*) This commit already existed in another branch; no separate mail sent

[hornetq] Initial import

Marek Goldmann — 2012-05-25T14:35:12

Summary of changes:

  9429372... Initial import (*)

(*) This commit already existed in another branch; no separate mail sent