From bb85239ad3d908741e4c30848c2ed7e69fe54bb2 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 10 Jun 2011 19:49:02 +0000 Subject: [PATCH] Remove stale packaging files, adjust log perms in specfile. --- Makefile.am | 5 ++-- Portfile.in | 81 ------------------------------------------------------ Shibboleth.sln | 3 -- configure.ac | 2 +- pkginfo.in | 11 -------- postinstall | 35 ----------------------- shibboleth.spec.in | 9 ++++-- 7 files changed, 9 insertions(+), 137 deletions(-) delete mode 100644 Portfile.in delete mode 100644 pkginfo.in delete mode 100644 postinstall diff --git a/Makefile.am b/Makefile.am index cc2eee8..7ebe87e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,12 +35,11 @@ dist-hook: rm -rf `find $(distdir)/isapi_shib -name .svn` rm -rf `find $(distdir)/doc/api -name .svn` -GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile +GENFILES = @PACKAGE_NAME@.spec EXTRA_DIST = $(DX_CONFIG) \ isapi_shib \ Shibboleth.sln \ config_win32.h \ $(GENFILES) \ - $(GENFILES:%=%.in) \ - postinstall + $(GENFILES:%=%.in) diff --git a/Portfile.in b/Portfile.in deleted file mode 100644 index 3adab00..0000000 --- a/Portfile.in +++ /dev/null @@ -1,81 +0,0 @@ -PortSystem 1.0 - -name @PACKAGE@ -version @PACKAGE_VERSION@ -categories security www shibboleth -maintainers scantor snc -description Shibboleth Native Service Provider -long_description Standards-based attribute-based Web SSO system -homepage http://shibboleth.internet2.edu/ -master_sites http://shibboleth.internet2.edu/downloads/${name}/cppsp/${version}/ -distname ${name}-sp-${version} -worksrcdir ${name}-${version} -checksums sha1 @CHECKSUM@ - -depends_lib port:opensaml \ - port:xmltooling \ - port:xercesc \ - port:xml-security-c \ - port:log4shib - -pre-fetch { - set status 0 - if {[catch {exec ${prefix}/bin/curl --version | grep SSL} results]} { - if {[lindex $::errorCode 0] eq "CHILDSTATUS"} { - set status [lindex $::errorCode 2] - } else { - set status [lindex $::errorCode 3] - } - } - if {${status} != 0} { - return -code error "\n - ${name} requires curl to be installed with SSL support. - Please deactivate your current curl installation and - install the proper version of curl: - sudo port deactivate curl - sudo port install curl +ssl\n" - } -} - -configure.args --with-xmltooling=${prefix} \ - --with-opensaml=${prefix} \ - --with-xerces=${prefix} \ - --with-xmlsec=${prefix} \ - --with-log4shib=${prefix} - -variant odbc { - depends_lib-append port:unixODBC - configure.args-append --enable-odbc -} - -destroot.keepdirs ${destroot}${prefix}/var/log/${name} ${destroot}${prefix}/var/log/httpd ${destroot}${prefix}/var/run/${name} - -destroot.args NOKEYGEN=1 - -post-destroot { - eval file delete [glob ${destroot}${prefix}/etc/${name}/*.logger] - eval file delete [glob ${destroot}${prefix}/etc/${name}/*.html] - eval file delete [glob ${destroot}${prefix}/etc/${name}/*.xml] - eval file delete [glob ${destroot}${prefix}/etc/${name}/shibd-*] - eval file delete [glob ${destroot}${prefix}/lib/${name}/*.la] -} - -post-activate { - # Make sure initial conf files are present and set up correctly - set confDir ${prefix}/etc/${name} - foreach f [glob -tails -directory ${confDir} *.dist] { - regexp {(.+)\.dist} $f ign destname - if {![file exists ${confDir}/${destname}]} { - file copy ${confDir}/${f} ${confDir}/${destname} - } - } - system "cd ${prefix}/etc/${name} && ./keygen.sh -b" -} - -startupitem.create yes -startupitem.name shibd -startupitem.executable ${prefix}/sbin/shibd -F -f -p ${prefix}/var/run/${name}/shibd.pid - -livecheck.check regex -livecheck.url http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/mac/ports/shibboleth/shibboleth/Portfile -livecheck.regex "version *(\\d+\\.\\d+(\\.\\d+)?)" diff --git a/Shibboleth.sln b/Shibboleth.sln index 76fd0bb..376bd56 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -79,9 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E doxygen.cfg = doxygen.cfg m4\doxygen.m4 = m4\doxygen.m4 Makefile.am = Makefile.am - pkginfo.in = pkginfo.in - Portfile.in = Portfile.in - postinstall = postinstall shibboleth.spec.in = shibboleth.spec.in EndProjectSection EndProject diff --git a/configure.ac b/configure.ac index 9c9ff0d..f546060 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ else fi AC_CONFIG_HEADERS([config.h shibsp/config_pub.h]) -AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile]) +AC_CONFIG_FILES([shibboleth.spec]) AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) diff --git a/pkginfo.in b/pkginfo.in deleted file mode 100644 index 9df027f..0000000 --- a/pkginfo.in +++ /dev/null @@ -1,11 +0,0 @@ -PKG=SHIBsp -VERSION=@PACKAGE_VERSION@ -BASEDIR=/ -NAME=shibboleth-sp -CATEGORY=application,security -DESC=Shibboleth Service Provider -VENDOR=Internet2 -HOTLINE=https://bugs.internet2.edu/ -CLASSES=none -PSTAMP=sunra.internet2.edu 2008-03-17 -EMAIL=cantor.2@osu.edu diff --git a/postinstall b/postinstall deleted file mode 100644 index a4d5110..0000000 --- a/postinstall +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -cd /opt/shibboleth-sp/etc/shibboleth - -CONFIGFILES=" \ - native.logger \ - shibd.logger \ - syslog.logger \ - console.logger \ - accessError.html \ - sessionError.html \ - metadataError.html \ - sslError.html \ - bindingTemplate.html \ - discoveryTemplate.html \ - localLogout.html \ - globalLogout.html \ - partialLogout.html \ - attribute-map.xml \ - attribute-policy.xml \ - example-metadata.xml \ - shibboleth2.xml" - -for f in $CONFIGFILES; do - if test ! -f $f; then - cp $f.dist $f - fi; - done - -PATH=$PATH:/usr/local/bin -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib -export PATH LD_LIBRARY_PATH -sh ./keygen.sh -b - -exit 0 diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 5888fbb..2ea0101 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -201,7 +201,7 @@ cd / %dir %{_libdir}/%{name} %{_libdir}/%{name}/* %exclude %{_libdir}/%{name}/*.la -%dir %{_localstatedir}/log/%{name} +%attr(0750,-,-) %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/run/%{name} %dir %{_datadir}/xml/%{name} %{_datadir}/xml/%{name}/* @@ -218,8 +218,8 @@ cd / %{_sysconfdir}/%{name}/*.dist %{_sysconfdir}/%{name}/apache*.config %{_sysconfdir}/%{name}/shibd-* -%attr(755, root, root) %{_sysconfdir}/%{name}/keygen.sh -%attr(755, root, root) %{_sysconfdir}/%{name}/metagen.sh +%attr(755,-,-) %{_sysconfdir}/%{name}/keygen.sh +%attr(755,-,-) %{_sysconfdir}/%{name}/metagen.sh %{_sysconfdir}/%{name}/*.xsl %doc %{pkgdocdir} %exclude %{pkgdocdir}/api @@ -232,6 +232,9 @@ cd / %doc %{pkgdocdir}/api %changelog +* Fri Jun 10 2011 Scott Cantor - 2.4.3-1 +- Log files shouldn't be world readable. + * Fri Dec 25 2009 Scott Cantor - 2.4-1 - Update dependencies. -- 2.1.4