/[smecontribs]/rpms/phpki-ng/contribs10/phpki-ng.spec
ViewVC logotype

Diff of /rpms/phpki-ng/contribs10/phpki-ng.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.8 by jcrisp, Thu Apr 1 09:12:23 2021 UTC Revision 1.13 by jcrisp, Thu Sep 30 16:31:50 2021 UTC
# Line 4  Line 4 
4    
5  %define         name phpki-ng  %define         name phpki-ng
6  %define         version 0.84  %define         version 0.84
7  %define         release 7  %define         release 12
8  Summary:        Phpki is a simple certificate management suite  Summary:        Phpki is a simple certificate management suite
9  Name:           %{name}  Name:           %{name}
10  Version:        %{version}  Version:        %{version}
# Line 20  Patch3:         phpki-ng-0.84-fix-crl.pa Line 20  Patch3:         phpki-ng-0.84-fix-crl.pa
20  Patch4:         phpki-ng-0.84-fix-missing-slash-certtype-detection.patch  Patch4:         phpki-ng-0.84-fix-missing-slash-certtype-detection.patch
21  Patch5:         phpki-ng-0.84-fix-html-directory-check.patch  Patch5:         phpki-ng-0.84-fix-html-directory-check.patch
22  Patch6:         phpki-ng-0.84-fix-download-cert.patch  Patch6:         phpki-ng-0.84-fix-download-cert.patch
23    Patch7:         phpki-ng-0.84-fix-html-syntax-in-help.patch
24    Patch8:         phpki-ng-0.84-fix-final-redirect.patch
25    
26    
27  BuildArch:      noarch  BuildArch:      noarch
28  BuildRoot:      /var/tmp/%{name}-%{version}  BuildRoot:      /var/tmp/%{name}-%{version}
# Line 42  With it, you may create and centrally ma Line 45  With it, you may create and centrally ma
45  e-mail clients, SSL servers, and VPN applications.  e-mail clients, SSL servers, and VPN applications.
46    
47  %changelog  %changelog
48    * Thu Sep 30 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-12.sme
49    - Attempt to fix the final reload after CA creation [SME: 11192]
50    
51    * Thu Aug 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-11.sme
52    - Fix html syntax error in help - Thanks Mauro De Carolis [SME: 11688]
53    
54    * Tue Apr 06 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-10.sme
55    - And tidy up the copying wording. [SME: 11192]
56    - Credit to Terry Fage for persisting with testing
57    
58    * Mon Apr 05 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-9.sme
59    - Really fix the copy this time [SME: 11192]
60    
61    * Sat Apr 03 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-8.sme
62    - copy phpki-store as a backup instead of move [SME: 11192]
63    
64  * Thu Apr 01 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-7.sme  * Thu Apr 01 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-7.sme
65  - Fix broken Download Certificate in Cert generation [SME: 11513]  - Fix broken Download Certificate in Cert generation [SME: 11513]
66    
67  * Thu Mar 18 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-6.sme  * Thu Mar 18 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.84-6.sme
68  - Update html header info  - Update html header info [SME: 11192]
69  - Remove obsolete align  - Remove obsolete align
70  - Remove accidentally duplicated html  - Remove accidentally duplicated html
71  - Fix typo  - Fix typo
# Line 186  e-mail clients, SSL servers, and VPN app Line 205  e-mail clients, SSL servers, and VPN app
205  %patch4 -p1  %patch4 -p1
206  %patch5 -p1  %patch5 -p1
207  %patch6 -p1  %patch6 -p1
208    %patch7 -p1
209    %patch8 -p1
210    
211  %build  %build
212  %{__mkdir_p} root/opt/phpki/html  %{__mkdir_p} root/opt/phpki/html
# Line 244  echo "*  This contrib now has higher lev Line 265  echo "*  This contrib now has higher lev
265  echo "* "  echo "* "
266  echo "*  We cannot upgrade your existing certificates"  echo "*  We cannot upgrade your existing certificates"
267  echo "* "  echo "* "
268  echo "*  If we detect an existing certificate store"  echo "*  If you have existing certificates you want to use"
269  echo "*  we are going to move it"  echo "*  then start with a new CA, backup up, and then restore"
270    echo "*  your phpki-store directory in /opt/phpki"
271  echo "* "  echo "* "
 echo "*  You can then start with a new CA and certificates"  
272  echo "******************************************************"  echo "******************************************************"
273  echo ""  echo ""
274    
# Line 256  if [ -d /opt/phpki/phpki-store ] ; then Line 277  if [ -d /opt/phpki/phpki-store ] ; then
277      RANDOM=$$      RANDOM=$$
278      PHPKIDIR=$(( 1 + $RANDOM%99999 ))      PHPKIDIR=$(( 1 + $RANDOM%99999 ))
279      echo "Number is $PHPKIDIR"      echo "Number is $PHPKIDIR"
280      echo "moving from /opt/phpki/phpki-store to /opt/phpki/phpki-store.$PHPKIDIR"      echo "Copying from /opt/phpki/phpki-store to /opt/phpki/phpki-store.$PHPKIDIR"
281      mv /opt/phpki/phpki-store "/opt/phpki/phpki-store.$PHPKIDIR"      /bin/cp -pr /opt/phpki/phpki-store "/opt/phpki/phpki-store.$PHPKIDIR"
282      echo "Directory moved...continuing installaton"      echo "Directory copied...continuing installaton"
283  else  else
284      echo "No directory detected...continuing installaton"      echo "No directory detected...continuing installaton"
285  fi  fi
286    
287  echo "Creating phpki user"  
288    
289  if ! /usr/bin/id phpki &>/dev/null; then  if ! /usr/bin/id phpki &>/dev/null; then
290    echo "Creating phpki user"
291          /usr/sbin/useradd -c 'Phpki User' -s /sbin/nologin -r -d /opt/phpki/phpki-store phpki &>/dev/null || \          /usr/sbin/useradd -c 'Phpki User' -s /sbin/nologin -r -d /opt/phpki/phpki-store phpki &>/dev/null || \
292                  %logmsg "Unexpected error adding user \"phpki\". Abort installation."                  %logmsg "Unexpected error adding user \"phpki\". Abort installation."
293  fi  fi

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed