rpms/sigul/EL-5 0001-Handle-signing-of-source-rpms.patch, NONE, 1.1 0002-Temporary-workaround-for-accidentially-re-downloadin.patch, NONE, 1.1 import.log, NONE, 1.1 sigul.logrotate, NONE, 1.1 sigul.spec, NONE, 1.1 sigul_bridge.init, NONE, 1.1 sigul_server.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Jesse Keating
jkeating at fedoraproject.org
Wed Jul 29 03:19:52 UTC 2009
Author: jkeating
Update of /cvs/pkgs/rpms/sigul/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27094/EL-5
Modified Files:
.cvsignore sources
Added Files:
0001-Handle-signing-of-source-rpms.patch
0002-Temporary-workaround-for-accidentially-re-downloadin.patch
import.log sigul.logrotate sigul.spec sigul_bridge.init
sigul_server.init
Log Message:
Import latest sigul for EL-5
0001-Handle-signing-of-source-rpms.patch:
server.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE 0001-Handle-signing-of-source-rpms.patch ---
>From 9502326ec4d0f7442fbb3dfc630b30bc3e711a04 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat.com>
Date: Fri, 24 Jul 2009 16:10:17 -0700
Subject: [PATCH] Handle signing of source rpms.
Source RPM 'arch' in the header can either be noarch, or the arch
of the host preparing the srpm. Therefor we need to detect a srpm
and react accordingly.
---
src/server.py | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/server.py b/src/server.py
index 4e554bd..9d2bce3 100644
--- a/src/server.py
+++ b/src/server.py
@@ -986,7 +986,13 @@ def cmd_sign_rpm(db, conn):
field_value = conn.safe_outer_field(field)
if field_value is None:
continue
- rpm_value = hdr[tag]
+ # rpm arch for srpms is noarch or the arch prepared on. Therefor
+ # check to see if sourcepage is 1
+ if field_value == 'src':
+ if hdr['sourcepackage'] == 1:
+ rpm_value = 'src'
+ else:
+ rpm_value = hdr[tag]
if rpm_value is None:
rpm_value = ''
if field_value != rpm_value:
--
1.6.2.5
0002-Temporary-workaround-for-accidentially-re-downloadin.patch:
bridge.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE 0002-Temporary-workaround-for-accidentially-re-downloadin.patch ---
>From a94667940ac9523b8132f9c003a8f4b4fab6b7af Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat.com>
Date: Tue, 28 Jul 2009 20:06:30 -0700
Subject: [PATCH 2/2] Temporary workaround for accidentially re-downloading stale rpms.
This is causing us to download the same rpm over and over which
really doesn't work well. This is a temporary work around given
to me by Mitr.
---
src/bridge.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/bridge.py b/src/bridge.py
index 15f6422..4bda697 100644
--- a/src/bridge.py
+++ b/src/bridge.py
@@ -309,7 +309,7 @@ class SignRpmRequestType(RequestType):
# attempts to initialize nss with our certificate database.
import koji
- if self.__koji_session is None:
+ if True:
try:
self.__koji_config = utils.koji_read_config()
# self.__request_fields['user'] safety was verified by
--
1.6.2.5
--- NEW FILE import.log ---
sigul-0_96-4:EL-5:sigul-0.96-4.src.rpm:1248837571
--- NEW FILE sigul.logrotate ---
/var/log/sigul*.log {
missingok
notifempty
}
--- NEW FILE sigul.spec ---
Summary: A signing server and related software client
Name: sigul
Version: 0.96
Release: 4
License: GPLv2
Group: Applications/Internet
URL: https://fedorahosted.org/sigul/
# Source may not be uploaded yet
Source0: https://fedorahosted.org/releases/s/i/sigul/sigul-%{version}.tar.bz2
Source1: sigul_bridge.init
Source2: sigul_server.init
Source3: sigul.logrotate
Requires: koji, logrotate, m2crypto, pexpect, pygpgme, python, python-fedora,
Requires: python-nss >= 0.6
Requires: python-sqlalchemy, python-sqlite2
Requires: python-urlgrabber
# For sigul_setup_client
Requires: coreutils nss-tools
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig, initscripts
Requires(postun): initscripts
BuildRequires: python
# To detect the path correctly in configure
BuildRequires: gnupg
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Patch0: 0001-Handle-signing-of-source-rpms.patch
Patch1: 0002-Temporary-workaround-for-accidentially-re-downloadin.patch
%description
A signing server, which lets authorized users sign data without having any
access to the necessary private key, a client for the server, and a "bridge"
that connects the two.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
mkdir -p $RPM_BUILD_ROOT%{_initrddir} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -p %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/sigul_bridge
install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/sigul_server
install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sigul
%clean
rm -rf $RPM_BUILD_ROOT
%pre
getent group sigul >/dev/null || groupadd -r sigul
getent passwd sigul >/dev/null || \
useradd -r -g sigul -d %{_localstatedir}/lib/sigul -s /sbin/nologin \
-c "Signing server or bridge" sigul
exit 0
%post
/sbin/chkconfig --add sigul_bridge
/sbin/chkconfig --add sigul_server
%preun
if [ "$1" = 0 ]; then
/sbin/service sigul_bridge stop >/dev/null 2>&1
/sbin/service sigul_server stop >/dev/null 2>&1
/sbin/chkconfig --del sigul_bridge
/sbin/chkconfig --del sigul_server
fi
%postun
if [ "$1" -ge 1 ]; then
/sbin/service sigul_bridge condrestart >/dev/null 2>&1 || :
/sbin/service sigul_server condrestart >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%dir %{_sysconfdir}/sigul
%config(noreplace) %{_sysconfdir}/sigul/client.conf
%config(noreplace) %attr(640,root,sigul) %{_sysconfdir}/sigul/bridge.conf
%config(noreplace) %attr(640,root,sigul) %{_sysconfdir}/sigul/server.conf
%{_initrddir}/sigul*
%config(noreplace) %{_sysconfdir}/logrotate.d/sigul
%{_bindir}/sigul*
%{_sbindir}/sigul*
%{_mandir}/man1/sigul*.1*
%{_mandir}/man8/sigul*.8*
%{_datadir}/sigul
%dir %attr(700,sigul,sigul) %{_localstatedir}/lib/sigul
%dir %attr(700,sigul,sigul) %{_localstatedir}/lib/sigul/gnupg
%changelog
* Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.96-4
- Add another patch to temporarily work around a stale koji issue.
- Bump python-nss reqs up now that we have a newer one in EPEL
* Mon Jul 27 2009 Jesse Keating <jkeating at redhat.com> - 0.96-3
- Setup the Requires right for EL5
* Mon Jul 27 2009 Jesse Keating <jkeating at redhat.com> - 0.96-2
- Fix various bugs while testing (release by Mitr)
- Patch from jkeating for srpm signing.
* Sat Jul 18 2009 Miloslav Trmač <mitr at redhat.com> - 0.95-0.mitr.1
- Update to 0.95.
- Add missing Requires: m2crypto.
* Wed Jul 1 2009 Miloslav Trmač <mitr at redhat.com> - 0.94-0.mitr.1
- Update to 0.94.
* Fri Apr 10 2009 Miloslav Trmač <mitr at redhat.com> - 0.93-0.mitr.1
- Update to 0.93.
* Wed Jan 28 2009 Miloslav Trmač <mitr at redhat.com> - 0.92-0.mitr.1
- Update to 0.92.
* Mon Jan 12 2009 Miloslav Trmač <mitr at redhat.com> - 0.91-0.mitr.1
- Update to 0.91.
* Sun Jan 11 2009 Miloslav Trmač <mitr at redhat.com> - 0.90-0.mitr.2
- Requires: koji, python-sqlite2
* Sun Jan 11 2009 Miloslav Trmač <mitr at redhat.com> - 0.90-0.mitr.1
- s/rpmsigner/sigul/g
* Sun Nov 30 2008 Miloslav Trmač <mitr at redhat.com> - 0.90-0.mitr.1
- Initial package.
--- NEW FILE sigul_bridge.init ---
#! /bin/sh
# chkconfig: - 99 01
# description: A network server that connects a signing server and its clients
. /etc/rc.d/init.d/functions
prog=sigul_bridge
lockfile=/var/lock/subsys/sigul_bridge
start()
{
echo -n $"Starting $prog: "
daemon "$prog" -d -v
RETVAL=$?
echo
[ "$RETVAL" -eq 0 ] && touch "$lockfile"
return "$RETVAL"
}
stop()
{
echo -n $"Shutting down $prog: "
killproc "$prog"
RETVAL=$?
echo
rm -f "$lockfile"
return "$RETVAL"
}
restart()
{
stop
start
}
rh_status_q()
{
status "$prog" >/dev/null 2>&1
}
case "$1" in
start)
rh_status_q && exit 0
start
;;
stop)
rh_status_q || exit 0
stop
;;
reload)
rh_status_q || exit 7
restart
;;
restart|force-reload)
restart
;;
condrestart|try-restart)
rh_status_q || exit 0
restart
;;
status)
status "$prog"
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
RETVAL=2
esac
exit "$RETVAL"
--- NEW FILE sigul_server.init ---
#! /bin/sh
# chkconfig: - 99 01
# description: A server that allows users to sign data without access to the \
# necessary key
. /etc/rc.d/init.d/functions
prog=sigul_server
lockfile=/var/lock/subsys/sigul_server
start()
{
echo -n $"Starting $prog: "
daemon "$prog" -d -v
RETVAL=$?
echo
[ "$RETVAL" -eq 0 ] && touch "$lockfile"
return "$RETVAL"
}
stop()
{
echo -n $"Shutting down $prog: "
killproc "$prog"
RETVAL=$?
echo
rm -f "$lockfile"
return "$RETVAL"
}
restart()
{
stop
start
}
rh_status_q()
{
status "$prog" >/dev/null 2>&1
}
case "$1" in
start)
rh_status_q && exit 0
start
;;
stop)
rh_status_q || exit 0
stop
;;
reload)
rh_status_q || exit 7
restart
;;
restart|force-reload)
restart
;;
condrestart|try-restart)
rh_status_q || exit 0
restart
;;
status)
status "$prog"
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
RETVAL=2
esac
exit "$RETVAL"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 29 Jul 2009 03:11:45 -0000 1.1
+++ .cvsignore 29 Jul 2009 03:19:52 -0000 1.2
@@ -0,0 +1 @@
+sigul-0.96.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 29 Jul 2009 03:11:45 -0000 1.1
+++ sources 29 Jul 2009 03:19:52 -0000 1.2
@@ -0,0 +1 @@
+faa8e4fd42d01ac08888ec9a88932820 sigul-0.96.tar.bz2
More information about the fedora-extras-commits
mailing list