[glite-px-proxyrenewal/el6] Release 1.3.35.
František Dvořák
valtri at fedoraproject.org
Tue May 6 19:31:59 UTC 2014
commit 1f9b76f169e6ba9b29f034ccef29508f437dbd16
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Tue May 6 21:35:08 2014 +0200
Release 1.3.35.
.gitignore | 1 +
daemon-location.patch | 59 -----------------------------
glite-px-proxyrenewal.spec | 32 +++++++++------
parallel.patch | 25 ------------
rhel7-configure.patch | 88 +++++++++++++++++++++++++++++++++++++++++++
rhel7-proxyrenewal.patch | 89 ++++++++++++++++++++++++++++++++++++++++++++
sources | 3 +-
7 files changed, 198 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9978704..e1b3988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/glite-px-proxyrenewal-1.3.34.tar.gz
/rhel.patch
+/glite-px-proxyrenewal-1.3.35.tar.gz
diff --git a/glite-px-proxyrenewal.spec b/glite-px-proxyrenewal.spec
index 472fba1..7b54603 100644
--- a/glite-px-proxyrenewal.spec
+++ b/glite-px-proxyrenewal.spec
@@ -1,17 +1,17 @@
+%global _hardened_build 1
+
Name: glite-px-proxyrenewal
-Version: 1.3.34
-Release: 1%{?dist}.1
+Version: 1.3.35
+Release: 1%{?dist}
Summary: gLite proxyrenewal renews existing proxy certificates for grid users
License: ASL 2.0
-Url: http://glite.cern.ch
+URL: http://glite.cern.ch
Source: http://scientific.zcu.cz/emi/emi.px.proxyrenewal/%{name}-%{version}.tar.gz
-# https://github.com/CESNET/proxyrenewal/commit/4f38d7c6d582c126b6ea67a7aca97348db22ac6a
-Patch0: daemon-location.patch
-# https://github.com/CESNET/proxyrenewal/commit/dce1f3a3c8e888ed2ba359fe2c7b63da87c76de1#diff-1
-Patch1: parallel.patch
-# https://github.com/CESNET/glite-lb/commit/2d5014baf9f436e408a42335a4c047ff85e39b99
-Patch2: rhel.patch
+# https://github.com/CESNET/glite-lb/commit/13d7d640eb940ebb7e5354f1a45b57dfbd01fed8#diff-16
+Patch0: rhel7-configure.patch
+# https://github.com/CESNET/proxyrenewal/commit/cc61becfd3db7a792e7800c4cc7741542dc56df0
+Patch1: rhel7-proxyrenewal.patch
BuildRequires: globus-gssapi-gsi-devel
BuildRequires: libtool
@@ -25,6 +25,7 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: psmisc
Provides: glite-px-proxyrenewal-progs = %{version}-%{release}
%description
@@ -53,11 +54,10 @@ proxyrenewal library.
%setup -q
%patch0 -p2
%patch1 -p2
-%patch2 -p2
%build
-perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --module px.proxyrenewal
+perl ./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --sysdefaultdir=%{_sysconfdir}/sysconfig --module=px.proxyrenewal
CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
@@ -116,8 +116,8 @@ fi
%{_bindir}/glite-proxy-renew
%{_sbindir}/glite-proxy-renewd
%{_sbindir}/glite-proxy-setup
-%{_mandir}/man1/glite-proxy-renew.1.gz
-%{_mandir}/man8/glite-proxy-renewd.8.gz
+%{_mandir}/man1/glite-proxy-renew.1*
+%{_mandir}/man8/glite-proxy-renewd.8*
%files libs
%doc LICENSE project/ChangeLog
@@ -136,6 +136,12 @@ fi
%changelog
+* Tue May 06 2014 František Dvořák <valtri at civ.zcu.cz> - 1.3.35-1
+- Release glite-px-proxyrenewal 1.3.35
+- Enable hardened build
+- Update patches, add EPEL 7 support
+- Add runtime dependency on psmisc (used by startup script)
+
* Wed Sep 4 2013 František Dvořák <valtri at civ.zcu.cz> - 1.3.34-1.1
- Patch for fixing glite-proxy-setup script (detection of RHEL in configure)
diff --git a/rhel7-configure.patch b/rhel7-configure.patch
new file mode 100644
index 0000000..250bdf7
--- /dev/null
+++ b/rhel7-configure.patch
@@ -0,0 +1,88 @@
+commit 13d7d640eb940ebb7e5354f1a45b57dfbd01fed8
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Fri Mar 28 14:50:01 2014 +0100
+
+ Deployment updates due to EPEL 7 and Debian 9/sid.
+
+ 1) os_type used only for startup/boot type,
+ "fedora" replaced by "systemd" (systemd can be used across distributions)
+ 2) workaround detection problem of EPEL 7
+ 3) removed automatic detection of mysqlconfdir (solved only inside packages now)
+ 4) new configure option --sysdefaultdir (typical values /etc/sysconfig or /etc/default)
+
+diff --git a/org.glite.lb/configure b/org.glite.lb/configure
+index b0632b8..38417e7 100755
+--- a/org.glite.lb/configure
++++ b/org.glite.lb/configure
+@@ -57,6 +57,7 @@ my $url = $default_url;
+ my $url_source;
+ my $docdir;
+ my $mysqlconfdir;
++my $sysdefaultdir;
+ my $pkg_config_env = (defined $ENV{PKG_CONFIG_PATH}) ? "$ENV{PKG_CONFIG_PATH}:" : '';
+
+ my @nodes = qw/client server logger logger-msg nagios utils client-java doc ws-test db jpprimary jpindex jpclient harvester lb px proxyrenewal canl/;
+@@ -263,6 +264,7 @@ my @opts = (
+ 'url-source=s' => \$url_source,
+ 'docdir=s' => \$docdir,
+ 'mysqlconfdir=s' => \$mysqlconfdir,
++ 'sysdefaultdir=s' => \$sysdefaultdir,
+ );
+
+ for (@nodes) {
+@@ -1231,6 +1233,9 @@ top_srcdir = $top_srcdir
+ if ($mysqlconfdir) {
+ print MKINC "mysqlconfdir = $mysqlconfdir\n";
+ }
++ if ($sysdefaultdir) {
++ print MKINC "sysdefaultdir = $sysdefaultdir\n";
++ }
+
+ for (@{$need_externs{$short}}) {
+ next unless defined $externs{$_} and defined $externs{$_}{prefix};
+@@ -1458,18 +1463,25 @@ sub getlibdir {
+ }
+
+ sub os_type {
+- my $ver;
++ #
++ # 1) check for systemd first (it can be used across distributions)
++ # 2) check for debian-like distribution (systemv scripts for Debian)
++ # 3) default is redhat-like (systemv scripts for Red Hat)
++ #
++ `pkg-config --exists systemd`;
++ return "systemd" if ($? == 0);
++ return "systemd" if (-e '/etc/fedora-release');
++
++ return "debian" if (-e '/etc/debian_version');
++
++ return "redhat" if (-r '/etc/redhat-release');
+
+ open FH, '<', '/etc/issue' or return "redhat";
+ $_=<FH>;
+ close FH;
+
+ if (/Debian|Ubuntu/i) { return "debian"; }
+- elsif (/Scientific|Redhat|Red Hat|Centos|Fedora/i) {
+- `pkg-config --exists systemd`;
+- if ($? == 0) { return "fedora"; }
+- else { return "redhat"; }
+- } else { return "redhat"; }
++ else { return "redhat"; }
+ }
+
+ sub usage {
+@@ -1486,9 +1498,10 @@ General options (defaults in []):
+ --sysroot=DIR system root (custom relocation root -> sysroot) []
+ --sysconfdir=DIR system configuration directory [PREFIX/etc]
+ --localstatedir=DIR system local status directory [PREFIX/var]
+- --docdir documentation directory []
+- --mysqlconfdir MySQL/MariaDB configuration directory []
+- --os-type=DIST system type (debian/redhat/fedora)
++ --docdir documentation directory []
++ --mysqlconfdir MySQL/MariaDB configuration directory []
++ --sysdefaultdir default configuration directory []
++ --os-type=DIST boot system type (debian/redhat/systemd)
+ --staged=module,module,... what is already in PREFIX (specify without org.glite.)
+ --thrflavour=flavour
+ --nothrflavour=flavour threaded and non-treaded flavours []
diff --git a/rhel7-proxyrenewal.patch b/rhel7-proxyrenewal.patch
new file mode 100644
index 0000000..a3e97cb
--- /dev/null
+++ b/rhel7-proxyrenewal.patch
@@ -0,0 +1,89 @@
+commit cc61becfd3db7a792e7800c4cc7741542dc56df0
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Mon May 5 10:04:48 2014 +0200
+
+ Deployment updates due to EPEL 7 and Debian 9/sid.
+
+ 1) os_type used only for startup/boot type,
+ "fedora" replaced by "systemd" (systemd can be used across distributions)
+ 2) new configure option --sysdefaultdir (typical values /etc/sysconfig or /etc/default)
+
+diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile
+index 26e0efa..85053a1 100644
+--- a/org.glite.px.proxyrenewal/Makefile
++++ b/org.glite.px.proxyrenewal/Makefile
+@@ -53,13 +53,9 @@ SOURCES=\
+ Makefile README
+ SOURCES_EXEC=config/setup config/startup doc/*.sh project/doc_proxyrenewal.pl
+
+-ifeq ($(os_type),debian)
+-sysdefaultdir=${sysconfdir}/default
+-else
+-sysdefaultdir=${sysconfdir}/sysconfig
+-endif
++sysdefaultdir?=${sysconfdir}/default
+
+-ifeq ($(os_type),fedora)
++ifeq ($(os_type),systemd)
+ unitdir=`pkg-config systemd --variable=systemdsystemunitdir`
+ endif
+
+@@ -230,7 +226,7 @@ install:
+ ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
+ ${INSTALL} -m 644 glite-px ${DESTDIR}${PREFIX}${docdir}/glite-px
+ ${INSTALL} -m 644 glite-px ${DESTDIR}${PREFIX}${sysdefaultdir}
+-ifeq ($(os_type),fedora)
++ifeq ($(os_type),systemd)
+ mkdir -p ${DESTDIR}${PREFIX}${unitdir}
+ ${INSTALL} -m 644 ${top_srcdir}/config/systemd.proxy-renewd ${DESTDIR}${PREFIX}${unitdir}/glite-proxy-renewd.service
+ else
+diff --git a/org.glite.px.proxyrenewal/config/setup b/org.glite.px.proxyrenewal/config/setup
+index b451c05..bc57037 100755
+--- a/org.glite.px.proxyrenewal/config/setup
++++ b/org.glite.px.proxyrenewal/config/setup
+@@ -136,11 +136,11 @@ if test "$setup_crl" = "1"; then
+ @redhat@ /sbin/chkconfig fetch-crl-boot on
+ @redhat@ /sbin/service fetch-crl-cron start
+ @redhat@ /sbin/service fetch-crl-boot start
+- at fedora@ systemctl enable fetch-crl-cron.service
+- at fedora@ systemctl enable fetch-crl-boot.service
+- at fedora@ systemctl start fetch-crl-cron.service
+- at fedora@ qecho "Fetching CRL..."
+- at fedora@ systemctl start fetch-crl-boot.service
++ at systemd@ systemctl enable fetch-crl-cron.service
++ at systemd@ systemctl enable fetch-crl-boot.service
++ at systemd@ systemctl start fetch-crl-cron.service
++ at systemd@ qecho "Fetching CRL..."
++ at systemd@ systemctl start fetch-crl-boot.service
+ else
+ echo "$NAME: WARNING: fetch-crl not found, fetching won't be configured"
+ fi
+@@ -159,17 +159,17 @@ if test "$setup_startup" = "1"; then
+ fi
+ fi
+ if test "$setup_startup" = "1" -a "$startup_error" != "1"; then
+- at fedora@ systemd_unitdir=`pkg-config systemd --variable=systemdsystemunitdir`
+- at fedora@ systemd_confdir=`pkg-config systemd --variable=systemdsystemconfdir`
+- at fedora@ sed -e "s|\(X509_USER_CERT\).*|\1=$GLITE_HOST_CERT|" \
+- at fedora@ -e "s|\(X509_USER_KEY\).*|\1=$GLITE_HOST_KEY|" \
+- at fedora@ $systemd_unitdir/glite-proxy-renewd.service > $systemd_confdir/glite-proxy-renewd.service
+- at fedora@ systemctl --system daemon-reload
+- at fedora@
+- at fedora@ systemctl enable glite-proxy-renewd.service
+- at fedora@
+- at fedora@ startup_error=0
+- at fedora@ systemctl restart glite-proxy-renewd.service || startup_error=1
++ at systemd@ systemd_unitdir=`pkg-config systemd --variable=systemdsystemunitdir`
++ at systemd@ systemd_confdir=`pkg-config systemd --variable=systemdsystemconfdir`
++ at systemd@ sed -e "s|\(X509_USER_CERT\).*|\1=$GLITE_HOST_CERT|" \
++ at systemd@ -e "s|\(X509_USER_KEY\).*|\1=$GLITE_HOST_KEY|" \
++ at systemd@ $systemd_unitdir/glite-proxy-renewd.service > $systemd_confdir/glite-proxy-renewd.service
++ at systemd@ systemctl --system daemon-reload
++ at systemd@
++ at systemd@ systemctl enable glite-proxy-renewd.service
++ at systemd@
++ at systemd@ startup_error=0
++ at systemd@ systemctl restart glite-proxy-renewd.service || startup_error=1
+ @debian@ update-rc.d glite-proxy-renewald defaults
+ @debian@
+ @debian@ startup_error=0
diff --git a/sources b/sources
index 588c63a..679ec92 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d4fc009fd69012c4c6117524540ff32e glite-px-proxyrenewal-1.3.34.tar.gz
-432b3e885626f6746dd1c2e3bbc8b2e4 rhel.patch
+31b3e586988ac8a69f7e42af8ca6e150 glite-px-proxyrenewal-1.3.35.tar.gz
More information about the scm-commits
mailing list