rpm/xca
SHA256
1
0
Fork 0
forked from pool/xca
Code Pull Requests Activity

Accepting request 123966 from home:computersalat:devel:security

Browse Source 
update to 0.9.3

OBS-URL: https://build.opensuse.org/request/show/123966
OBS-URL: https://build.opensuse.org/package/show/security/xca?expand=0&rev=2
This commit is contained in:
Marcus Meissner 2012-06-06 21:41:23 +00:00 committed by Git OBS Bridge
parent 71beebe64c
commit e5a2cb3b6c
8 changed files with 210 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xca-0.9.0-Makefile.patch
View File

@ -1,21 +0,0 @@
diff -ruN xca-0.9.0-orig/Makefile xca-0.9.0/Makefile
--- xca-0.9.0-orig/Makefile 2010-08-29 10:28:32.000000000 +0200
+++ xca-0.9.0/Makefile 2010-10-04 23:11:28.000000000 +0200
@@ -23,7 +23,7 @@
bindir=bin
-all: headers xca$(SUFFIX) doc lang
+all: headers xca$(SUFFIX) doc img lang
@echo -e "\n\n\nOk, compilation was successfull. \nNow do as root: 'make install'\n"
xca.o: $(OBJECTS)
@@ -34,6 +34,8 @@
doc:
$(MAKE) -C doc
+img:
+ $(MAKE) -C img
lang:
$(MAKE) -C lang

88
xca-0.9.0-configure.patch
View File

@ -1,88 +0,0 @@
diff -ruN xca-0.9.0-orig/configure xca-0.9.0/configure
--- xca-0.9.0-orig/configure 2010-08-29 10:28:32.000000000 +0200
+++ xca-0.9.0/configure 2010-10-04 22:19:02.000000000 +0200
@@ -26,9 +26,12 @@
done
DIRS="$QTDIR $DIRS /usr /usr/X11R6 /usr/local"
+lib=${lib:=lib}
+libdir=${libdir:=/usr/lib}
STDINC="-I/usr/include"
-STDLIB="-L/usr/lib"
+STDLIB="-L${libdir}"
prefix=${prefix:=/usr/local}
+mandir=${mandir:=${prefix}/man}
CFLAGS=${CFLAGS:=-Wall -ggdb -O2}
CC=${CC:=gcc}
CF="-I. -I.. -I\$(TOPDIR)/ui"
@@ -103,10 +106,10 @@
for dir in ${DIRS}; do
for dbn in $@; do
for suffix in so dylib obj a; do
- for lib in lib lib64 lib32 out; do
- if test -r "${dir}/${lib}/lib${dbn}.${suffix}"; then
- add_lib "${dir}/${lib}" "${dbn}" "${suffix}"
- echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}"
+ for libs in ${lib} out; do
+ if test -r "${dir}/${libs}/lib${dbn}.${suffix}"; then
+ add_lib "${dir}/${libs}" "${dbn}" "${suffix}"
+ echo "Found: lib${dbn}.${suffix} at ${dir}/${libs}"
return 0
fi
done
@@ -119,7 +122,7 @@
echo -e "\n\nConfiguring XCA `cat VERSION`\n----------------------------"
######################### QT
-subdirs="/qt /qt4"
+subdirs="/qt /qt4 /qt/QT /qt4/QT"
search_includes QtCore/QObject || err "The QT Library headerfiles were not found. Set QTDIR appropriately."
search_lib QtGui4 QtGui || err "The QT library was not found."
search_lib ltdl || err "Libtool ltdl not found."
@@ -215,12 +218,15 @@
STRIP=${STRIP:=strip}
WINDRES=${WINDRES:=windres}
MAKENSIS=${MAKENSIS:=makensis.exe}
-LINUXDOC=${LINUXDOC:=linuxdoc}
+SGML2HTML=${SGML2HTML:=sgml2html}
SUFFIX=${SUFFIX}
HOST=linux
prefix=${prefix}
docdir=${docdir}
+lib=${lib}
+libdir=${libdir}
+mandir=${mandir}
EOF
test -z "$etc" && etc=/etc/xca
diff -ruN xca-0.9.0-orig/doc/Makefile xca-0.9.0/doc/Makefile
--- xca-0.9.0-orig/doc/Makefile 2010-08-29 10:28:32.000000000 +0200
+++ xca-0.9.0/doc/Makefile 2010-10-04 22:33:54.000000000 +0200
@@ -7,21 +7,19 @@
doc: xca.1.gz xca.html
include $(TOPDIR)/Rules.mak
-mandir=man
-
xca.1.gz: xca.1
gzip -9 <$^ >$@
xca.html: xca.sgml
rm -f xca*.html
echo '<h1>No documentation generated</h1>' > $@
- $(LINUXDOC) -B html $<
+ $(SGML2HTML) -s 1 $<
install: xca.1.gz xca.html
- install -m 755 -d $(destdir)$(docdir) \
- $(destdir)$(prefix)/$(mandir)/man1
- install -m 644 xca*.html $(destdir)$(docdir)
- install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
+ install -m 755 -d $(destdir)$(prefix)/share/xca \
+ $(destdir)$(mandir)/man1
+ install -m 644 xca*.html $(destdir)$(prefix)/share/xca
+ install -m 644 xca.1.gz $(destdir)$(mandir)/man1
app: xca.html
mkdir -p $(APPDIR)/Resources

3
xca-0.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aeb080ed9478b803dc1f5d9fa7e35acb4ccb1ed6153af8ae1abde5e5506b014c
size 629264

3
xca-0.9.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6842b50c8b4478070d8af743cb72aee1f53a2c4ff2b8285fcec5f856119cc6ba
size 755165

127
xca-configure.patch Normal file
View File

@ -0,0 +1,127 @@
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -49,13 +49,16 @@ for dir in $@; do
done
DIRS="$QTDIR $DIRS /usr /usr/X11R6 /usr/local"
+lib=${lib:=lib}
+libdir=${libdir:=/usr/lib}
STDINC="-I/usr/include"
-STDLIB="-L/usr/lib"
+STDLIB="-L${libdir}"
prefix=${prefix:=/usr/local}
+mandir=${mandir:=${prefix}/man}
CFLAGS=${CFLAGS:=-Wall -ggdb -O2}
CC=${CC:=gcc}
-LDFLAGS=""
-LIBS="-lstdc++"
+LDFLAGS=${LDFLAGS:=""}
+LIBS=${LIBS:=$STDLIB -lstdc++}
LDIRS=
MOC=moc
UIC=uic
@@ -161,10 +164,10 @@ search_lib() {
for dir in ${DIRS}; do
for dbn in $@; do
for suffix in so dylib obj a; do
- for lib in lib lib64 lib32 out; do
- if test -r "${dir}/${lib}/lib${dbn}.${suffix}"; then
- add_lib "${dir}/${lib}" "${dbn}" "${suffix}"
- echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}"
+ for libs in ${lib} out; do
+ if test -r "${dir}/${libs}/lib${dbn}.${suffix}"; then
+ add_lib "${dir}/${libs}" "${dbn}" "${suffix}"
+ echo "Found: lib${dbn}.${suffix} at ${dir}/${libs}"
return 0
fi
done
@@ -189,7 +192,7 @@ if test "$#" = "0" && test -z "$DARWIN"
pkg-config QtGui openssl --libs >/dev/null;
then
CF="`pkg-config QtGui openssl --cflags`"
- LIBS="`pkg-config QtGui openssl --libs` -lltdl"
+ LIBS="${LIBS} `pkg-config QtGui openssl --libs` -lltdl"
else
by_hand=true
fi
@@ -197,7 +200,7 @@ fi
if test "$by_hand" = "true"; then
######################### QT
if test -z "$DARWIN"; then
- subdirs="/qt /qt4"
+ subdirs="/qt /qt4 /qt/QT /qt4/QT"
search_includes QtCore/QObject || err "The QT Library headerfiles were not found. Set QTDIR appropriately."
search_lib QtCore4 QtCore || err "The QT Core library was not found."
search_lib QtGui4 QtGui || err "The QT Gui library was not found."
@@ -282,16 +285,12 @@ else
fi
-if which linuxdoc 2>&1; then
- LINUXDOC="linuxdoc"
+if which sgml2html 2>&1; then
+ SGML2HTML="sgml2html"
else
- echo "Application 'linuxdoc' not found."
- if tar ztf ${TOPDIR}/doc/xca-doc.tgz xca.html >/dev/null 2>&1; then
- echo "But Found a valid documentation package 'doc/xca-doc.tgz'"
- else
+ echo "Application 'sgml2html' not found."
echo "No documentation will be generated."
- fi
- LINUXDOC=":"
+ SGML2HTML=":"
fi
findapp() {
@@ -341,12 +340,15 @@ LD=${LD:=ld}
STRIP=${STRIP:=strip}
WINDRES=${WINDRES:=windres}
MAKENSIS=${MAKENSIS:=makensis.exe}
-LINUXDOC=${LINUXDOC:=linuxdoc}
+SGML2HTML=${SGML2HTML:=sgml2html}
SUFFIX=${SUFFIX}
HOST=linux
prefix=${prefix}
docdir=${docdir}
+lib=${lib}
+libdir=${libdir}
+mandir=${mandir}
EOF
test -z "$etc" && etc=/etc/xca
Index: doc/Makefile
===================================================================
--- doc/Makefile.orig
+++ doc/Makefile
@@ -8,8 +8,6 @@ DELFILES=xca*.html xca.1.gz
doc: xca.1.gz xca.html
include $(TOPDIR)/Rules.mak
-mandir=man
-
xca.1.gz: xca.1
gzip -9 <$^ >$@
@@ -18,13 +16,13 @@ xca.html: xca.sgml
echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
@$(PRINT) " DOC [$(BASENAME)] $@"
- $(LINUXDOC) -B html $< >/dev/null
+ $(SGML2HTML) -s 1 $< >/dev/null
install: xca.1.gz xca.html
- install -m 755 -d $(destdir)$(docdir) \
- $(destdir)$(prefix)/$(mandir)/man1
- install -m 644 xca*.html $(destdir)$(docdir)
- install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
+ install -m 755 -d $(destdir)$(prefix)/share/xca \
+ $(destdir)/$(mandir)/man1
+ install -m 644 xca*.html $(destdir)$(prefix)/share/xca
+ install -m 644 xca.1.gz $(destdir)/$(mandir)/man1
app: xca.html
mkdir -p $(APPDIR)/Resources

13
xca-0.9.0-desktop.patch → xca-desktop.patch
View File

@ -1,10 +1,11 @@
diff -ruN xca-0.9.0-orig/misc/xca.desktop xca-0.9.0/misc/xca.desktop Index: misc/xca.desktop
--- xca-0.9.0-orig/misc/xca.desktop 2010-08-29 10:28:32.000000000 +0200 ===================================================================
+++ xca-0.9.0/misc/xca.desktop 2010-10-04 22:03:15.000000000 +0200 --- misc/xca.desktop.orig
@@ -6,7 +6,7 @@ +++ misc/xca.desktop
Comment[de]=Eine graphische Oberfläche zur Erstellung von X.509 konformen Zertifikaten @@ -7,7 +7,7 @@ Comment[de]=Eine graphische Oberfläche
Comment[fi]=Graafinen X.509-varmenteiden hallintatyökalu Comment[fi]=Graafinen X.509-varmenteiden hallintatyökalu
Exec=xca Comment[fr]=Création et gestion de certificats conformes à la norme X.509
Exec=xca %F
-Icon=xca-32x32.xpm -Icon=xca-32x32.xpm
+Icon=xca-32x32 +Icon=xca-32x32
Terminal=false Terminal=false

51
xca.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Wed Jun 6 20:37:43 UTC 2012 - chris@computersalat.de
- update to 0.9.3
* Fix double free in a1time resulting in random crashes
- fix License (http://spdx.org/licenses/)
* BSD-3-Clause
- rebase patches
-------------------------------------------------------------------
Mon May 7 18:42:49 UTC 2012 - chris@computersalat.de
- update to 0.9.2
* Support for Local timezone dates.
Differentiate between invalid and undefined dates.
* Fix Bug #3461403 Error when create certificate with CRL distribution point
User error -> Improve user-friendlyness
* Fix Bug #3485139 Exception when creating certificates in passwordless db
* Avoid very long names resulting in duplicate names in the database.
* Add warning colors for expired dates.
- rebase patches
-------------------------------------------------------------------
Tue Nov 8 22:32:27 UTC 2011 - chris@computersalat.de
- update to 0.9.1
* Close bug [ 3372449 ] All numeric names cannot be used
* add search functionality for PKCS#11 libraries
* fix ASN.1 encoding of PKCS#10 request
* Close bug [ 3318203 ] Build failure with GNU gold linker
* Add x509v3 extensions to the list of selectable columns
* Close bug [ 3314262 ] Incorrect "Path length" template parameter handling
* Close bug [ 3314263 ] Unrevoking a certificate does not make it "Trusted"
* Feature Request [3286442] Make success/import messges optional
* improve Password entry
* Improve SPKAC import
* add french translation by Patrick Monnerat
* Export requests or certificates as openssl config file
* Support building with EC disabled
* Close bug [3091576] Private key export is always PKCS#8 encoded
* Feature Request [3058196] Autoload database
* Feature Request [3058195] Export directly to the clipboard
* Close bug [3062711] Additional OIDs
* Close bug [3062708] Invalid user configuration file path name
* Fix PKCS#11 library handling
- remove obsolete Makefile patch
- rework configure, desktop patch
* remove version from name
- fix deps
* remove obsolete dos2unix (COPYRIGHT got fixed)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 4 21:14:15 UTC 2010 - chris@computersalat.de Mon Oct 4 21:14:15 UTC 2010 - chris@computersalat.de

44
xca.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xca (Version 0.9.0) # spec file for package xca
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,21 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: xca Name: xca
Summary: An RSA key and certificate management tool Summary: An RSA key and certificate management tool
Summary(de): Ein RSA Schlüssel- und Zertifikat-Managmentprogramm Summary(de): Ein RSA Schlüssel- und Zertifikat-Managmentprogramm
Version: 0.9.0 Version: 0.9.3
Release: 1 Release: 0
License: BSD License: BSD-3-Clause
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Url: http://freshmeat.net/projects/xca/ Url: http://sourceforge.net/projects/xca/
Autoreqprov: on Autoreqprov: on
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.gz
Patch0: %{name}-0.9.0-Makefile.patch Patch0: %{name}-configure.patch
Patch1: %{name}-0.9.0-configure.patch Patch1: %{name}-desktop.patch
Patch2: %{name}-0.9.0-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ >= 3.1.0 BuildRequires: gcc-c++ >= 3.1.0
%if 0%{?sles_version} == 10 %if 0%{?sles_version} == 10
@ -37,9 +35,14 @@ BuildRequires: qt-devel >= 4.3.0
%else %else
BuildRequires: libqt4-devel >= 4.3.0 BuildRequires: libqt4-devel >= 4.3.0
%endif %endif
%if 0%{?suse_version}
BuildRequires: libtool
BuildRequires: update-desktop-files
%else
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: openssl-devel >= 0.9.8 BuildRequires: openssl-devel >= 0.9.8
BuildRequires: sgmltool update-desktop-files BuildRequires: sgmltool
BuildRequires: dos2unix
%if 0%{?sles_version} == 10 %if 0%{?sles_version} == 10
Requires: qt >= 4.3.0 Requires: qt >= 4.3.0
%else %else
@ -56,17 +59,14 @@ Graphical certification authority is an interface for managing RSA keys and cert
%prep %prep
%setup -n %{name}-%{version} %setup -n %{name}-%{version}
dos2unix COPYRIGHT %patch0
%patch0 -p1 %patch1
%patch1 -p1
%patch2 -p1
#./mkxcapro.sh && $QTDIR/bin/lrelease xca.pro CFLAGS="$RPM_OPT_FLAGS" \
CFLAGS=$RPM_OPT_FLAGS prefix=/usr lib=%{_lib} libdir=%{_libdir} mandir=/usr/share/man ./configure prefix=%{_prefix} lib=%{_lib} libdir=%{_libdir} mandir=%{_mandir} ./configure
%build %build
#%{__make} %{?jobs:-j%jobs} destdir=$PRM_BUILD_ROOT prefix=/usr %{__make} destdir=$PRM_BUILD_ROOT prefix=%{_prefix} %{?_smp_mflags}
%{__make} destdir=$PRM_BUILD_ROOT prefix=/usr
%install %install
%{__make} destdir=$RPM_BUILD_ROOT prefix=/usr install %{__make} destdir=$RPM_BUILD_ROOT prefix=/usr install
@ -77,7 +77,7 @@ CFLAGS=$RPM_OPT_FLAGS prefix=/usr lib=%{_lib} libdir=%{_libdir} mandir=/usr/shar
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYRIGHT INSTALL INSTALL.qmake VERSION changelog %doc AUTHORS changelog COPYRIGHT VERSION
%{_bindir}/%{name} %{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime/packages/%{name}.xml