[packages/pesign] - updated to 0.112 - removed obsolete uninitialized patch - added pld patch (PLDify SysV init script
qboosh
qboosh at pld-linux.org
Fri Jun 24 17:34:07 CEST 2016
commit 02f0f164b12ff858554370cc150cac55f4c0e2c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 24 17:34:05 2016 +0200
- updated to 0.112
- removed obsolete uninitialized patch
- added pld patch (PLDify SysV init scripts)
- added build patch (avoid warnings, -Werror is in use)
pesign-build.patch | 25 +++++++++++
pesign-pld.patch | 104 +++++++++++++++++++++++++++++++++++++++++++++
pesign-uninitialized.patch | 11 -----
pesign.spec | 51 +++++++++++++++++-----
4 files changed, 169 insertions(+), 22 deletions(-)
---
diff --git a/pesign.spec b/pesign.spec
index 94fa78b..75f2866 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -1,15 +1,16 @@
-# TODO: PLDify init script
Summary: Signing tool for PE-COFF binaries
Summary(pl.UTF-8): Narzędzie do podpisywania binariów PE-COFF
Name: pesign
-Version: 0.109
-Release: 0.1
+Version: 0.112
+Release: 1
License: GPL v2
Group: Applications/System
-Source0: https://github.com/vathpela/pesign/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 5214a68896a54775a211f02667fedd7b
-Patch0: %{name}-uninitialized.patch
-URL: https://github.com/vathpela/pesign
+#Source0Download: https://github.com/rhinstaller/pesign/releases
+Source0: https://github.com/rhinstaller/pesign/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: eae1d66e160be744ff310ad7592ae31e
+Patch0: %{name}-pld.patch
+Patch1: %{name}-build.patch
+URL: https://github.com/rhinstaller/pesign
BuildRequires: nspr-devel
BuildRequires: nss-devel
BuildRequires: pkgconfig
@@ -74,22 +75,36 @@ Statyczna biblioteka libdpe.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e 's/-g -O0/%{rpmcflags} -Wno-unused-result/' Make.defaults
-%{__sed} -i -e 's,/usr/lib/systemd/system,%{systemdunitdir},' src/Makefile
+%{__sed} -i -e 's,\$(libdatadir)systemd/system,%{systemdunitdir},' src/Makefile
%build
%{__make} \
CC="%{__cc}" \
- LIBDIR=%{_libdir}
+ LIBDIR=%{_libdir} \
+ libexecdir=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install install_systemd install_sysvinit \
DESTDIR=$RPM_BUILD_ROOT \
- LIBDIR=%{_libdir}
+ LIBDIR=%{_libdir} \
+ libexecdir=%{_libdir}
+
+# omitted from install (as of 0.112)
+install libdpe/libdpe.so $RPM_BUILD_ROOT%{_libdir}/libdpe.so.%{version}
+ln -sf libdpe.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libdpe.so.0
+ln -sf libdpe.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libdpe.so
+cp -p libdpe/libdpe.a $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT%{_includedir}/libdpe
+cp -p include/libdpe/*.h $RPM_BUILD_ROOT%{_includedir}/libdpe
+
+# just unwanted COPYING file; make space for %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/COPYING
%clean
rm -rf $RPM_BUILD_ROOT
@@ -120,9 +135,18 @@ fi
%files
%defattr(644,root,root,755)
%doc README TODO
+%attr(755,root,root) %{_bindir}/authvar
%attr(755,root,root) %{_bindir}/efikeygen
+%attr(755,root,root) %{_bindir}/efisiglist
+%attr(755,root,root) %{_bindir}/pesigcheck
%attr(755,root,root) %{_bindir}/pesign
%attr(755,root,root) %{_bindir}/pesign-client
+%dir %{_libdir}/pesign
+%attr(755,root,root) %{_libdir}/pesign/pesign-authorize-groups
+%attr(755,root,root) %{_libdir}/pesign/pesign-authorize-users
+%dir %{_sysconfdir}/pesign
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pesign/groups
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pesign/users
%attr(775,pesign,pesign) %dir /etc/pki/pesign
# what should be proper owner???
%dir /etc/popt.d
@@ -132,16 +156,21 @@ fi
%{systemdunitdir}/pesign.service
%attr(770,pesign,pesign) %dir /var/run/pesign
%{systemdtmpfilesdir}/pesign.conf
+%{_mandir}/man1/authvar.1*
%{_mandir}/man1/efikeygen.1*
+%{_mandir}/man1/efisiglist.1*
+%{_mandir}/man1/pesigcheck.1*
%{_mandir}/man1/pesign.1*
%{_mandir}/man1/pesign-client.1*
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libdpe.so
+%attr(755,root,root) %{_libdir}/libdpe.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdpe.so.0
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdpe.so
%{_includedir}/libdpe
%files static
diff --git a/pesign-build.patch b/pesign-build.patch
new file mode 100644
index 0000000..fa8e870
--- /dev/null
+++ b/pesign-build.patch
@@ -0,0 +1,25 @@
+--- pesign-0.112/libdpe/pe_allocspace.c.orig 2016-04-20 18:11:32.000000000 +0200
++++ pesign-0.112/libdpe/pe_allocspace.c 2016-06-23 21:35:48.693876721 +0200
+@@ -61,7 +61,7 @@
+ struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
+
+ Pe_Scn *scn = NULL;
+- struct section_header shdr = { 0, }, tmp_shdr;
++ struct section_header shdr = { { 0, }, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, tmp_shdr;
+ if (pehdr->sections < 1)
+ return -1;
+
+--- pesign-0.112/src/cms_common.c.orig 2016-04-20 18:11:32.000000000 +0200
++++ pesign-0.112/src/cms_common.c 2016-06-23 21:44:34.271029426 +0200
+@@ -663,7 +663,11 @@
+ .type = siUnsignedInteger,
+ };
+
++#if defined(_LP64)
+ if (integer < 0x100000000) {
++#else
++ if (1) {
++#endif
+ u32 = integer & 0xffffffffUL;
+ input.data = (void *)&u32;
+ input.len = sizeof(u32);
diff --git a/pesign-pld.patch b/pesign-pld.patch
new file mode 100644
index 0000000..628c05b
--- /dev/null
+++ b/pesign-pld.patch
@@ -0,0 +1,104 @@
+--- pesign-0.112/src/pesign.sysvinit.in.orig 2016-04-20 18:11:32.000000000 +0200
++++ pesign-0.112/src/pesign.sysvinit.in 2016-06-24 17:29:09.145983773 +0200
+@@ -13,41 +13,44 @@
+ # Description: The pesign PE signing daemon
+ ### END INIT INFO
+
+-. /etc/init.d/functions
+-[ -f /usr/bin/pesign ] || exit 1
++. /etc/rc.d/init.d/functions
+
+ RETVAL=0
+
+-start(){
+- echo -n "Starting pesign: "
++start() {
++ if [ -f /var/lock/subsys/pesign ]; then
++ msg_already_running "pesign"
++ return
++ fi
++
++ msg_starting pesign
+ daemon /usr/bin/pesign --daemonize
+ RETVAL=$?
+- echo
+- touch /var/lock/subsys/pesign
++ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pesign
+ @@LIBEXECDIR@@/pesign/pesign-authorize-users
+ @@LIBEXECDIR@@/pesign/pesign-authorize-groups
+ }
+
+-stop(){
+- echo -n "Stopping pesign: "
++stop() {
++ if [ ! -f /var/lock/subsys/pesign ]; then
++ msg_not_running pesign
++ return
++ fi
++
++ msg_stopping pesign
+ killproc -p /var/run/pesign.pid pesignd
+- RETVAL=$?
+- echo
+ rm -f /var/lock/subsys/pesign
+ }
+
+-restart(){
+- stop
+- start
+-}
+-
+-reload(){
+- stop
+- start
+-}
++condrestart() {
++ if [ ! -f /var/lock/subsys/pesign ]; then
++ msg_not_running pesign
++ RETVAL=$1
++ return
++ fi
+
+-condrestart(){
+- [ -e /var/lock/subsys/pesign ] && restart
++ stop
++ start
+ }
+
+ # See how we were called.
+@@ -59,26 +62,22 @@
+ stop
+ ;;
+ status)
+- status /usr/bin/pesign
++ status pesign /usr/bin/pesign
++ RETVAL=$?
+ ;;
+ restart)
+- restart
+- ;;
+- reload)
+- reload
++ stop
++ start
+ ;;
+ force-reload)
+- reload
+- ;;
+- condrestart)
+- condrestart
++ condrestart 7
+ ;;
+- try-restart)
+- condrestart
++ try-restart|condrestart)
++ condrestart 0
+ ;;
+ *)
+- echo "Usage: pesign {start|stop|status|restart|condrestart|reload}"
+- RETVAL=1
++ echo "Usage: pesign {start|stop|status|restart|try-restart|condrestart|force-reload}"
++ exit 3
+ esac
+
+ exit $RETVAL
diff --git a/pesign-uninitialized.patch b/pesign-uninitialized.patch
deleted file mode 100644
index 0bb1ed7..0000000
--- a/pesign-uninitialized.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pesign-0.109/src/efikeygen.c.orig 2013-10-09 16:45:11.000000000 +0200
-+++ pesign-0.109/src/efikeygen.c 2014-08-21 21:07:31.942245018 +0200
-@@ -333,7 +333,7 @@
-
- oid = SECOID_FindOIDByTag(SEC_OID_PKCS9_EXTENSION_REQUEST);
-
-- for (int i; crq->attributes[i]; i++) {
-+ for (int i = 0; crq->attributes[i]; i++) {
- attr = crq->attributes[i];
- if (attr->attrType.len != oid->oid.len)
- continue;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pesign.git/commitdiff/02f0f164b12ff858554370cc150cac55f4c0e2c8
More information about the pld-cvs-commit
mailing list