From 04ab0ac29ec8fb45ffda8a2e07091db1748b0396 Mon Sep 17 00:00:00 2001
From: Andreas Leibl <andreas@leibl.co.uk>
Date: Wed, 30 Apr 2014 09:57:03 +0100
Subject: [PATCH] Some cleanup plus packaging enhancements.

- AIX: Changed the pre-deinstall script to unconfigure
       to address an issue where failed deinstallations
       caused follow-on problems
       Changed pre-install script to post-install and
       added additional link
       Removed typo in AIX Makefile
- Solaris: Removed symlink from /usr/bin to allow installations
           into local zones
- README.install: moved up one directory
---
 AIX/Makefile                                        | 2 +-
 AIX/lpp_template.in                                 | 4 ++--
 AIX/{sscep.pre-install.sh => sscep.post-install.sh} | 1 +
 AIX/sscep.pre-deinstall.sh                          | 4 ----
 AIX/sscep.unconfiguration.sh                        | 5 +++++
 tmp/README.install => README.install                | 0
 Solaris/Prototype                                   | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
 rename AIX/{sscep.pre-install.sh => sscep.post-install.sh} (52%)
 delete mode 100755 AIX/sscep.pre-deinstall.sh
 create mode 100755 AIX/sscep.unconfiguration.sh
 rename tmp/README.install => README.install (100%)

diff --git a/AIX/Makefile b/AIX/Makefile
index 0793406..6b3aeb5 100644
--- a/AIX/Makefile
+++ b/AIX/Makefile
@@ -10,7 +10,7 @@ WITH_DEBUG   = -g
 OPENSSL = ../openssl
 CFLAGS	= -O $(WITH_DEBUG) -I $(OPENSSL)/include 
 
-LDFLAGS = -L$(OPENSSL)/lib
+LDFLAGS = -L$(OPENSSL)
 LDLIBS = -lcrypto
 
 MAN	= sscep.8
diff --git a/AIX/lpp_template.in b/AIX/lpp_template.in
index 7fbdd9b..e8c1957 100644
--- a/AIX/lpp_template.in
+++ b/AIX/lpp_template.in
@@ -10,8 +10,8 @@ Fileset
   Include license files in this package: N
   Requisites:
   USRLIBLPPFiles
-    Pre-installation Script: __PACKAGINGDIR__/AIX/sscep.pre-install.sh
-    Pre-deinstall Script: __PACKAGINGDIR__/AIX/sscep.pre-deinstall.sh
+    Post-installation Script: __PACKAGINGDIR__/AIX/sscep.post-install.sh
+    Unconfiguration Script: __PACKAGINGDIR__/AIX/sscep.unconfiguration.sh
   EOUSRLIBLPPFiles
   USRFiles
     /opt/CertNanny
diff --git a/AIX/sscep.pre-install.sh b/AIX/sscep.post-install.sh
similarity index 52%
rename from AIX/sscep.pre-install.sh
rename to AIX/sscep.post-install.sh
index 94d3563..280ca57 100755
--- a/AIX/sscep.pre-install.sh
+++ b/AIX/sscep.post-install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/ksh
 
 /usr/bin/ln -fs /opt/CertNanny/bin/sscep_static /usr/bin/sscep
+/usr/bin/ln -fs /opt/CertNanny/bin/sscep_static /opt/CertNanny/bin/sscep
 
diff --git a/AIX/sscep.pre-deinstall.sh b/AIX/sscep.pre-deinstall.sh
deleted file mode 100755
index e72bc8b..0000000
--- a/AIX/sscep.pre-deinstall.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/ksh
-
-/usr/bin/rm /usr/bin/sscep
-
diff --git a/AIX/sscep.unconfiguration.sh b/AIX/sscep.unconfiguration.sh
new file mode 100755
index 0000000..5ddafdf
--- /dev/null
+++ b/AIX/sscep.unconfiguration.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/ksh
+
+/usr/bin/rm -f /usr/bin/sscep
+/usr/bin/rm -f /opt/CertNanny/bin/sscep
+
diff --git a/tmp/README.install b/README.install
similarity index 100%
rename from tmp/README.install
rename to README.install
diff --git a/Solaris/Prototype b/Solaris/Prototype
index 1e7045a..5936497 100644
--- a/Solaris/Prototype
+++ b/Solaris/Prototype
@@ -8,5 +8,5 @@ s none /opt/CertNanny/bin/sscep=/opt/CertNanny/bin/sscep_static
 f none /opt/CertNanny/COPYRIGHT.sscep 0644 root root
 d none /usr ? ? ?
 d none /usr/bin ? ? ?
-s none /usr/bin/sscep=/opt/CertNanny/bin/sscep_static
+#s none /usr/bin/sscep=/opt/CertNanny/bin/sscep_static