[shibboleth-sp2] 56/119: Preparing for 1.3.1 version.
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Tue Jan 26 21:29:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to annotated tag 1.3.1
in repository shibboleth-sp2.
commit b9364e82fdd757a0e4f270404d0774458899ebbc
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Sat Sep 15 21:49:15 2007 +0000
Preparing for 1.3.1 version.
---
.gitignore | 36 -------------
Makefile.am | 12 +----
adfs/.gitignore | 12 -----
adfs/adfs.rc | 12 ++---
apache/.gitignore | 16 ------
apache/mod_shib_13.rc | 12 ++---
apache/mod_shib_20.rc | 12 ++---
apache/mod_shib_22.rc | 12 ++---
config_win32.h | 6 +--
configs/.gitignore | 12 -----
configure.ac | 4 +-
dependencies/mysql/pkginfo | 2 +-
doc/.gitignore | 2 -
doc/INSTALL-WIN32.txt | 8 +--
doc/INSTALL.txt | 96 +---------------------------------
doc/Makefile.am | 1 -
doc/NEWS.txt | 7 +++
doc/README.txt | 6 +--
doc/mysql-4.0.12.diff | 35 -------------
include/.gitignore | 1 -
installshield/.gitignore | 3 --
isapi_shib/.gitignore | 5 --
isapi_shib/isapi_shib.rc | 12 ++---
msi/.gitignore | 3 --
nsapi_shib/.gitignore | 6 ---
nsapi_shib/nsapi_shib.rc | 10 ++--
oncrpc/.gitignore | 12 -----
oncrpc/rpc/.gitignore | 6 ---
pkginfo.in | 4 +-
posttest/.gitignore | 5 --
schemas/.gitignore | 14 -----
selinux/.gitignore | 3 --
shar/.gitignore | 14 -----
shar/shar.rc | 10 ++--
shib-mysql-ccache/.gitignore | 11 ----
shib-mysql-ccache/shib_mysql_ccache.rc | 12 ++---
shib-target/.gitignore | 12 -----
shib-target/shib-target.rc | 14 ++---
shib/.gitignore | 11 ----
shib/shib.rc | 14 ++---
shibboleth.spec.in | 22 ++++----
shibtest/.gitignore | 5 --
siterefresh/.gitignore | 10 ----
test/.gitignore | 8 ---
xmlproviders/.gitignore | 12 -----
xmlproviders/xmlproviders.rc | 12 ++---
46 files changed, 98 insertions(+), 456 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 11a74b1..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# A simulation of Subversion default ignores, generated by reposurgeon.
-*.o
-*.lo
-*.la
-*.al
-*.libs
-*.so
-*.so.[0-9]*
-*.a
-*.pyc
-*.pyo
-*.rej
-*~
-*.#*
-.*.swp
-.DS_store
-# Simulated Subversion default ignores end here
-# The contents of the svn:ignore property on the branch root.
-/aclocal.m4
-/config.h.in
-/config.h
-/*.cache
-/install-sh
-/mkinstalldirs
-/missing
-/config.*
-/stamp*
-/Makefile.in
-/Makefile
-/depcomp
-/configure
-/libtool
-/*.opt
-/*.ncb
-/shibboleth.spec
-/.settings
diff --git a/Makefile.am b/Makefile.am
index 057da2a..7422c34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,21 +3,11 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
EXTRA_DIST = \
- schemas doc isapi_shib \
+ isapi_shib \
Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
config_win32.h posttest/posttest.dsp shibtest/shibtest.dsp \
shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall
-dist-hook:
- rm -rf `find $(distdir)/schemas -name CVS`
- rm -rf `find $(distdir)/schemas -name Makefile`
- rm -rf `find $(distdir)/configs -name CVS`
- rm -rf `find $(distdir)/configs -name Makefile`
- rm -rf `find $(distdir)/doc -name CVS`
- rm -rf `find $(distdir)/doc -name Makefile`
- rm -rf `find $(distdir)/isapi_shib -name CVS`
- rm -rf `find $(distdir)/isapi_shib_gui -name CVS`
-
WANT_SUBDIRS = @WANT_SUBDIRS@
SUBDIRS = $(WANT_SUBDIRS)
diff --git a/adfs/.gitignore b/adfs/.gitignore
deleted file mode 100644
index db379c7..0000000
--- a/adfs/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/Debug
-/*.plg
-/Release
-/*.dep
-/*.mak
-/*.aps
\ No newline at end of file
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index d1b2bca..d9d9a3a 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,14 +73,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth ADFS Plugins\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "adfs\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "adfs.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/.gitignore b/apache/.gitignore
deleted file mode 100644
index c65b1ea..0000000
--- a/apache/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/Debug
-/*.plg
-/Release
-/*.dep
-/*.mak
-/mod_shib20___Win32_Debug
-/mod_shib20___Win32_Release
-/*.aps
-/mod_shib22___Win32_Debug
-/mod_shib22___Win32_Release
\ No newline at end of file
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 7fea7be..4dbbed6 100644
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "mod_shib_13\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index 4cd91bb..df40151 100644
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "mod_shib_20\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 72d0afd..8878d4b 100644
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "mod_shib_22\0"
- VALUE "LegalCopyright", "Copyright � 2006 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/config_win32.h b/config_win32.h
index 155f520..027d1e7 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -113,13 +113,13 @@
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 1.3"
+#define PACKAGE_STRING "shibboleth 1.3.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3"
+#define PACKAGE_VERSION "1.3.1"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -135,7 +135,7 @@
#define USE_OUR_ONCRPC 1
/* Version number of package */
-#define VERSION "1.3"
+#define VERSION "1.3.1"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configs/.gitignore b/configs/.gitignore
deleted file mode 100644
index 610238b..0000000
--- a/configs/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile
-/Makefile.in
-/apache.config
-/apache2.config
-/shar.logger
-/shire.logger
-/shibboleth.ini
-/shibboleth.xml
-/creds.xml
-/AAP.xml
-/IQ-sites.xml
-/IQ-trust.xml
diff --git a/configure.ac b/configure.ac
index ac5fea3..9d5f3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.3], [shibboleth-users at internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.3.1], [shibboleth-users at internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[1.3])
+AM_INIT_AUTOMAKE([shibboleth],[1.3.1])
sinclude(acx_pthread.m4)
sinclude(acx_rpctest.m4)
diff --git a/dependencies/mysql/pkginfo b/dependencies/mysql/pkginfo
index 7f4244f..8948d47 100644
--- a/dependencies/mysql/pkginfo
+++ b/dependencies/mysql/pkginfo
@@ -4,7 +4,7 @@ NAME=MySQL - MySQL database including embedded library
VERSION=4.1.12
CATEGORY=system
VENDOR=http://mysql.com/ packaged for Shibboleth by Scott Cantor
-HOTLINE=http://bugzilla.internet2.edu/
+HOTLINE=https://bugs.internet2.edu/
EMAIL=cantor.2 at osu.edu
PSTAMP=11Jun2005
CLASSES=none
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 05db30c..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
\ No newline at end of file
diff --git a/doc/INSTALL-WIN32.txt b/doc/INSTALL-WIN32.txt
index 883d5fe..34c8790 100644
--- a/doc/INSTALL-WIN32.txt
+++ b/doc/INSTALL-WIN32.txt
@@ -1,4 +1,4 @@
-Version 1.3f, shib Library version "6", shibtarget Library Version "5"
+Version 1.3.1, shib Library version "6", shibtarget Library Version "5"
This release works with SAML library version "5".
@@ -16,11 +16,5 @@ library files are. Using the global directory settings is the easiest way.
You can choose which, if any, web server modules to build, in case you don't
need or want one or more of them.
-To build the MySQL cache plugin, a fairly customized build of MySQL is required,
-which we haven't fully documented. At a minimum, you must build from source using
-the MySQL Visual C++ workspace, the projects must all be modified to use the
-DLL C/C++ runtime, and the USE_TLS macro must be defined for the projects. If you
-need specifics, ask for help.
-
For more information about Windows builds, please read the OpenSAML
INSTALL-WIN32.txt file.
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index 8859342..a7b57d4 100644
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -2,99 +2,5 @@ Binary distributions of the Shibboleth code are available.
Information on obtaining and installing binaries can be found at
http://shibboleth.internet2.edu/
-This document provides details for those wishing to build from source.
The Wiki contains additional information and more up to date build
-notes.
-
-C++ Service Provider
-
-Your first step is going to be the OpenSAML INSTALL.txt file. Please read it
-thoroughly to understand the issues. All the requirements in that file
-apply, mainly because you need to build OpenSAML, and almost all the
-dependencies are the same. Once you reach the end of that build process and
-have some confidence it worked, you can come back and continue here.
-
---- Apache
-
-You'll next need to get an Apache in place. If you're building from source,
-you don't have to use the "real" Apache code, or use mod_ssl. You will
-however need to provide the necessary build flags during configure, or
-ideally, let our configure script use your Apache's apxs script to extract
-the necessary information.
-
-Also, at a minimum, Apache needs to be built with mod_so enabled for
-dynamically loading modules. If you encounter problems with crashing
-or apparent module conflicts, make sure you've built Apache and any
-modules with threading support and ideally as much dynamically as
-possible.
-
-Apache 1.3 does not directly support threads, but you can set the
-CFLAGS variable before running configure to include the proper gcc
-thread flag (usually -pthread or -pthreads, depends on your platform).
-
---- MySQL (optional)
-
-The distribution now includes a cache plugin using embedded MySQL.
-This plugin will be included in the build by default if the embedded MySQL
-library (libmysqld.a) can be found, or if the --with-mysql option is passed
-to configure. You can force exclude the plugin with the --disable-mysql option.
-
-Many default installs of MySQL will not include the embedded library, so don't
-be surprised if it's not there. Also, just as with PHP and certain other packages
-that include C++, you'll need to build it with the same compiler used to build
-Shibboleth.
-
-The MySQL 4.x build is currently not clean. There are errors in several
-Makefile.in files that have to corrected to get the build to work.
-The patch for the pre-configure Makefile.in files in version 4.0.12 is included
-in this directory as the file "mysql-4.0.12.diff", which can be applied from the
-mysql-4.0.12 directory. Similar changes may be needed in other versions.
-
-After patching, to get it to build, the --with-embedded-server option is used
-with MySQL. An example build with gcc/g++ is below:
-
-$ cd mysql-4.1.12
-$ env CFLAGS="-fPIC -DPIC" CXXFLAGS="-fPIC -DPIC"
-$ ./configure --prefix=/opt/mysql \
- --libexecdir='${exec_prefix}/sbin' --disable-static \
- --enable-thread-safe-client --enable-assembler --enable-local-infile \
- --with-extra-charsets=complex --with-embedded-server \
- --with-berkeley-db --with-innodb --with-raid
-$ make all
-$ make install
-
-MySQL has a lot of options, so some local customization may be needed. The
-command to set the compiler flags is critical on Solaris, because the flags
-are needed to get a correct build of the library to link against.
-
---- Shibboleth
-
-Building the Shibboleth libraries, shibd, test programs, and Apache
-modules is more or less like building OpenSAML. You can get the code from
-SVN and run the bootstrap script if you want, or just use a source tarball.
-
-With the source distribution or the results of your bootstrap:
-
-$ ./configure --prefix=/opt/shibboleth-sp --with-log4cpp=/opt/shibboleth-sp \
- --enable-apache-20 -C
-$ make
-$ make install
-
-This will build the Apache 2.0 modules by extracting build settings
-from apxs. You can use different options to build for other Apache
-versions or specify the location of the apxs script.
-
-To test your installation, you can run the shibtest utility, which actually
-loads your configuration and attempts to obtain attributes from a Shibboleth
-Attribute Authority. It's not a great tool for testing because normally you
-can't query on a known principal name.
-
-$ set LD_LIBRARY_PATH=/opt/shibboleth-sp/lib; export LD_LIBRARY_PATH
-$ /opt/shibboleth-sp/bin/shibtest -h test-handle \
- -f urn:mace:shibboleth:test:nameIdentifier \
- -q https://idp.example.org/shibboleth
-
-The example shown uses a test principal that is specific to the InQueue
-sample IdP, which is known to the SP after initial installation.
-You should get some reasonably structured output back that lists some
-attributes. Some warnings or errors are normal.
+notes at https://spaces.internet2.edu/display/SHIB/BuildingShibboleth
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e3f76c3..6d19507 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,6 +12,5 @@ pkgdoc_DATA = \
OPENSSL.LICENSE \
LOG4CPP.LICENSE \
CURL.LICENSE \
- mysql-4.0.12.diff \
main.css \
logo.jpg
\ No newline at end of file
diff --git a/doc/NEWS.txt b/doc/NEWS.txt
index 055353d..5dcb5b4 100644
--- a/doc/NEWS.txt
+++ b/doc/NEWS.txt
@@ -1,3 +1,10 @@
+Sep 15, 2007
+Version 1.3.1
+
+Refresh of branch with numerous bug and portability fixes
+Enhancements to RequestMap
+FastCGI support
+
Oct 2, 2006
Version 1.3f
diff --git a/doc/README.txt b/doc/README.txt
index d12a035..83431c5 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,5 +1,5 @@
-Oct 2, 2006
-Version 1.3f
+Sep 15, 2007
+Version 1.3.1
Welcome to Internet2's Shibboleth
@@ -19,7 +19,7 @@ Source and binary distributions are available from
http://shibboleth.internet2.edu/downloads/
SVN is available for anonymous access, as described at the Shibboleth
-site. Mailing lists and a bugzilla (http://bugzilla.internet2.edu/) are also
+site. Mailing lists and a Jira instance (https://bugs.internet2.edu/) are also
available. Not all of the lists are open, but a general support list is
available and is open.
diff --git a/doc/mysql-4.0.12.diff b/doc/mysql-4.0.12.diff
deleted file mode 100644
index 0c523d2..0000000
--- a/doc/mysql-4.0.12.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- isam/Makefile.in~ Sat Mar 15 10:48:07 2003
-+++ isam/Makefile.in Mon Apr 7 22:59:53 2003
-@@ -306,7 +306,8 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+CXXLD = $(CXX)
-+LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
- pack_isam.c test1.c test2.c test3.c
---- myisam/Makefile.in~ Sat Mar 15 10:48:08 2003
-+++ myisam/Makefile.in Mon Apr 7 23:11:44 2003
-@@ -339,7 +339,8 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+CXXLD = $(CXX)
-+LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libmyisam_a_SOURCES) ft_dump.c mi_test1.c mi_test2.c \
- mi_test3.c myisamchk.c myisamlog.c myisampack.c
---- libmysqld/examples/Makefile.in~ Sat Mar 15 10:48:08 2003
-+++ libmysqld/examples/Makefile.in Tue Apr 8 00:24:40 2003
-@@ -274,7 +274,7 @@
- $(CXXLINK) $(mysql_LDFLAGS) $(mysql_OBJECTS) $(mysql_LDADD) $(LIBS)
- mysqltest$(EXEEXT): $(mysqltest_OBJECTS) $(mysqltest_DEPENDENCIES)
- @rm -f mysqltest$(EXEEXT)
-- $(LINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS)
-+ $(CXXLINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index ca80809..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/shibrpc.h
\ No newline at end of file
diff --git a/installshield/.gitignore b/installshield/.gitignore
deleted file mode 100644
index b907a7e..0000000
--- a/installshield/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Media
-/Description.txt
-/Notes.txt
\ No newline at end of file
diff --git a/isapi_shib/.gitignore b/isapi_shib/.gitignore
deleted file mode 100644
index db2ecd0..0000000
--- a/isapi_shib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/*.plg
-/Release
-/Debug
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 2849eec..ab6483b 100644
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "isapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/msi/.gitignore b/msi/.gitignore
deleted file mode 100644
index 784fea0..0000000
--- a/msi/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.wsi
-/*.msi
-/wise
diff --git a/nsapi_shib/.gitignore b/nsapi_shib/.gitignore
deleted file mode 100644
index 058c8a6..0000000
--- a/nsapi_shib/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/*.plg
-/Release
-/Debug
-/*.dep
-/*.mak
-/*.aps
\ No newline at end of file
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index aed329a..40c6e20 100644
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "nsapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Shibboleth\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/oncrpc/.gitignore b/oncrpc/.gitignore
deleted file mode 100644
index 190f7bc..0000000
--- a/oncrpc/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/*.aps
-/*.plg
-/Release
-/Debug
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/oncrpc/rpc/.gitignore b/oncrpc/rpc/.gitignore
deleted file mode 100644
index 26d1c48..0000000
--- a/oncrpc/rpc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
\ No newline at end of file
diff --git a/pkginfo.in b/pkginfo.in
index 4e59a5c..3a1365c 100644
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -4,8 +4,8 @@ NAME=Shibboleth Service Provider
VERSION=@-VERSION-@
CATEGORY=system
VENDOR=http://shibboleth.internet2.edu/ packaged for Shibboleth by Scott Cantor
-HOTLINE=http://bugzilla.internet2.edu/
+HOTLINE=https://bugs.internet2.edu/
EMAIL=cantor.2 at osu.edu
-PSTAMP=02Oct2006
+PSTAMP=15Sep2007
CLASSES=none
BASEDIR=/opt/shibboleth-sp
diff --git a/posttest/.gitignore b/posttest/.gitignore
deleted file mode 100644
index 7e79cab..0000000
--- a/posttest/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Debug
-/*.plg
-/Release
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/schemas/.gitignore b/schemas/.gitignore
deleted file mode 100644
index d2e7f0f..0000000
--- a/schemas/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/aclocal.m4
-/config.h.in
-/config.h
-/*.cache
-/install-sh
-/mkinstalldirs
-/missing
-/config.*
-/stamp*
-/Makefile.in
-/Makefile
-/depcomp
-/configure
-/libtool
\ No newline at end of file
diff --git a/selinux/.gitignore b/selinux/.gitignore
deleted file mode 100644
index 3d02e90..0000000
--- a/selinux/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile.in
-/Makefile
-/shibshar.fc
\ No newline at end of file
diff --git a/shar/.gitignore b/shar/.gitignore
deleted file mode 100644
index f8edc76..0000000
--- a/shar/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/.libs
-/.deps
-/Makefile
-/Makefile.in
-/shibd
-/test-client
-/*.plg
-/testclient___Win32_Debug
-/testclient___Win32_Release
-/Debug
-/Release
-/*.dep
-/*.mak
-/*.aps
\ No newline at end of file
diff --git a/shar/shar.rc b/shar/shar.rc
index 6ece829..2eff741 100644
--- a/shar/shar.rc
+++ b/shar/shar.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Daemon Service\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "shibd\0"
VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibd.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shib-mysql-ccache/.gitignore b/shib-mysql-ccache/.gitignore
deleted file mode 100644
index 3626fb7..0000000
--- a/shib-mysql-ccache/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/*.plg
-/Release
-/Debug
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/shib-mysql-ccache/shib_mysql_ccache.rc b/shib-mysql-ccache/shib_mysql_ccache.rc
index 2279299..53b88df 100644
--- a/shib-mysql-ccache/shib_mysql_ccache.rc
+++ b/shib-mysql-ccache/shib_mysql_ccache.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth MySQL Cache Plugin\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "shib-mysql-ccache\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shib-mysql-ccache.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shib-target/.gitignore b/shib-target/.gitignore
deleted file mode 100644
index 384a73c..0000000
--- a/shib-target/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/Debug
-/Release
-/*.plg
-/*.mak
-/*.dep
-/shib-paths.h
\ No newline at end of file
diff --git a/shib-target/shib-target.rc b/shib-target/shib-target.rc
index 5050962..9daaeb5 100644
--- a/shib-target/shib-target.rc
+++ b/shib-target/shib-target.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 5,1,0,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
- VALUE "FileDescription", "Shibboleth Target Library\0"
- VALUE "FileVersion", "5, 0, 0, 0\0"
+ VALUE "FileDescription", "Shibboleth SP Library\0"
+ VALUE "FileVersion", "5, 1, 0, 0\0"
#ifdef _DEBUG
VALUE "InternalName", "shibtarget_5D\0"
#else
VALUE "InternalName", "shibtarget_5\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
VALUE "OriginalFilename", "shibtarget_5D.dll\0"
@@ -61,8 +61,8 @@ BEGIN
VALUE "OriginalFilename", "shibtarget_5.dll\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shib/.gitignore b/shib/.gitignore
deleted file mode 100644
index d252dca..0000000
--- a/shib/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/Debug
-/Release
-/*.dep
-/*.mak
-/*.plg
\ No newline at end of file
diff --git a/shib/shib.rc b/shib/shib.rc
index 9808c15..31976fb 100644
--- a/shib/shib.rc
+++ b/shib/shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 6,1,0,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,14 +46,14 @@ BEGIN
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
- VALUE "FileDescription", "Shibboleth Core\0"
- VALUE "FileVersion", "6, 0, 0, 0\0"
+ VALUE "FileDescription", "Shibboleth Core Library\0"
+ VALUE "FileVersion", "6, 1, 0, 0\0"
#ifdef _DEBUG
VALUE "InternalName", "shib_6D\0"
#else
VALUE "InternalName", "shib_6\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
VALUE "OriginalFilename", "shib_6D.dll\0"
@@ -61,8 +61,8 @@ BEGIN
VALUE "OriginalFilename", "shib_6.dll\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index c16081b..b5d56fb 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,22 +1,19 @@
Name: shibboleth
Summary: Open source system to enable inter-institutional resource sharing
Version: @-VERSION-@
-Release: 11
-#Copyright: Internet2
+Release: 1
Group: System Environment/Libraries
-License: Apache style
+Vendor: Internet2
+License: Apache 2.0
URL: http://shibboleth.internet2.edu/
Source0: http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: openssl-devel, curl-devel >= 7.10.6
-BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1, xml-security-c-devel >= 1.1.0
-BuildRequires: zlib-devel, opensaml-devel >= 1.1-6, opensaml-devel < 2.0
-%if %{?_with_log4cpp:1}
-BuildRequires: log4cpp-devel >= 0.3.5
-%else
-BuildRequires: log4shib-devel
-%endif
+BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0, xml-security-c-devel >= 1.1.0
+BuildRequires: zlib-devel, opensaml-devel >= 1.1.1, opensaml-devel < 2.0
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
%if "%{_vendor}" == "redhat"
%{!?_without_builtinapache:BuildRequires: httpd-devel}
%endif
@@ -148,7 +145,7 @@ fi
%files -f rpm.filelist
%defattr(-,root,root,-)
%doc _docs/CREDITS.txt _docs/NOTICE.txt _docs/NEWS.txt _docs/logo.jpg
-%doc _docs/main.css _docs/README.txt _docs/LICENSE.txt _docs/mysql-4.0.12.diff
+%doc _docs/main.css _docs/README.txt _docs/LICENSE.txt
%{_sbindir}/shibd
%{_sbindir}/siterefresh
%{_bindir}/shibtest
@@ -181,6 +178,9 @@ fi
%{_libdir}/libshib-target.so
%changelog
+* Sat Sep 15 2007 Scott Cantor <cantor.2 at osu.edu> - 1.3.1-1
+- 1.3.1 release
+
* Mon Oct 2 2006 Scott Cantor <cantor.2 at osu.edu> - 1.3-11
- Applied fix for secadv 20061002
- Fix for metadata loader loop
diff --git a/shibtest/.gitignore b/shibtest/.gitignore
deleted file mode 100644
index 7e79cab..0000000
--- a/shibtest/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Debug
-/*.plg
-/Release
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/siterefresh/.gitignore b/siterefresh/.gitignore
deleted file mode 100644
index 82c7145..0000000
--- a/siterefresh/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/.libs
-/.deps
-/Makefile
-/Makefile.in
-/siterefresh
-/*.plg
-/Debug
-/Release
-/*.dep
-/*.mak
\ No newline at end of file
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index cfaffb8..0000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/.libs
-/.deps
-/Makefile
-/Makefile.in
-/shibtest
-/posttest
-/xmlsectest
-/inittest
\ No newline at end of file
diff --git a/xmlproviders/.gitignore b/xmlproviders/.gitignore
deleted file mode 100644
index fb26262..0000000
--- a/xmlproviders/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile.in
-/Makefile
-/.libs
-/.deps
-/*.lo
-/*.la
-/*.dep
-/*.mak
-/*.plg
-/Debug
-/Release
-/*.aps
\ No newline at end of file
diff --git a/xmlproviders/xmlproviders.rc b/xmlproviders/xmlproviders.rc
index 0a042f9..efb021c 100644
--- a/xmlproviders/xmlproviders.rc
+++ b/xmlproviders/xmlproviders.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Core Plugins\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
+ VALUE "FileVersion", "1, 3, 1, 0\0"
VALUE "InternalName", "xmlproviders\0"
- VALUE "LegalCopyright", "Copyright � 2005 Internet2\0"
+ VALUE "LegalCopyright", "Copyright � 2007 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "xmlproviders.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 1.3\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Shibboleth\0"
+ VALUE "ProductVersion", "1, 3, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list