--- a/ChangeLog	Fri Jul 27 10:23:02 2007 +0000
+++ b/ChangeLog	Sat Jul 28 02:07:00 2007 +0000
@@ -1,3 +1,17 @@
+2007-07-28  Doug Scott  <[email protected]>
+
+	* SFEgsslib.spec: *NEW* GNU gss (/usr/gnu)
+	* SFEjabberd.spec: *NEW* Jabber server
+	* SFEshishi.spec: *NEW* GNU Kerb V5 authentication
+	* SFEfix-info-dir.spec: *NEW* updates /usr/share/info/dir
+	* SFElibtasn1.spec: *NEW* Tiny ASN.1 library
+	* SFElibgsasl.spec: *NEW* GNU SASL framework
+	* SFElibntlm.spec: *NEW* Microsoft's NTLM authentication library
+	* patches/shishi-02-include_next.diff: SS12 include_next bug
+	* patches/jabberd-01-string-conversion.diff: type difference
+	* patches/fix-info-dir-01-gccism.diff: Remove gcc specifics
+	* patches/shishi-01-min.diff: add MIN macro
+
 2007-07-27  Doug Scott  <[email protected]>
 
 	* SFElibanthy.spec: *NEW* Japanese input method

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEfix-info-dir.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,49 @@
+#
+# spec file for package SFEfix-info-dir
+#
+# includes module(s): fix-info-dir
+#
+%include Solaris.inc
+
+%define	src_name fix-info-dir
+%define	src_url	http://ftp.pld-linux.org/software/fix-info-dir
+
+Name:                SFEfix-info-dir
+Summary:             Utility to fix infodir
+Version:             0.13
+Source:              %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1:		     fix-info-dir-01-gccism.diff
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+cp fix-info-dir $RPM_BUILD_ROOT%{_sbindir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_sbindir}
+
+%changelog
+* Thu Jul 26 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgsslib.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,124 @@
+#
+# spec file for package SFEgsslib
+#
+# includes module(s): gsslib
+#
+%include Solaris.inc
+%include usr-gnu.inc
+
+%define	src_name gss
+%define	src_url	http://josefsson.org/gss/releases
+
+Name:                SFEgsslib
+Summary:             GNU Generic Security Service
+Version:             0.0.22
+Source:              %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%if %build_l10n
+%package l10n
+Summary:                 %{summary} - l10n files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+%endif
+
+%prep
+%setup -q -n %{src_name}-%version
+rm m4/gettext.m4
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+%if %build_l10n
+nlsopt=-enable-nls
+%else
+nlsopt=-disable-nls
+%endif
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+aclocal -I m4 -I gl/m4
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}			\
+            --bindir=%{_bindir}			\
+            --libdir=%{_libdir}			\
+            --sysconfdir=%{_sysconfdir}		\
+            --includedir=%{_includedir} 	\
+            --mandir=%{_mandir}			\
+	    --infodir=%{_infodir}		\
+	    --localedir=%{_localedir}		\
+	    --disable-rpath			\
+	    --disable-static			\
+	    --enable-shared			\
+	    $nlsopt
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+cd $RPM_BUILD_ROOT%{_prefix}
+ln -s share/man man
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+  echo '/usr/sbin/fix-info-dir' | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%preun
+  echo '/usr/sbin/fix-info-dir' | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_prefix}
+%{_bindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_prefix}/man
+%{_mandir}
+%dir %attr(0755, root, sys) %{_std_datadir}
+%dir %attr(0755, root, bin) %{_infodir}
+%{_infodir}/*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Fri Jul 27 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEjabberd.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,92 @@
+#
+# spec file for package SFEjabberd
+#
+# includes module(s): jabberd
+#
+%include Solaris.inc
+
+%define	src_name jabberd
+%define	src_url	http://ftp.xiaoka.com/jabberd2/releases
+
+Name:                SFEjabberd
+Summary:             Jabber - XMPP Server
+Version:             2.1.11
+Source:              %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1:		     jabberd-01-string-conversion.diff
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SFEexpat
+BuildRequires: SFEgsslib-devel
+Requires: SFEgsslib
+BuildRequires: SFEsqlite-devel
+Requires: SFEsqlite
+BuildRequires: SUNWpostgr-82-devel
+Requires: SUNWpostgr-82-libs
+Requires: SFEbdb
+Requires: SUNWmysqlu
+Requires: SUNWmysqlr
+
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CPPFLAGS="-I/usr/gnu/include -I/usr/postgres/8.2/include -I/usr/sfw/include/mysql -I/usr/sfw/include"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+export LD_OPTIONS="-L/usr/gnu/lib -L/usr/postgres/8.2/lib -L/usr/sfw/lib -R/usr/postgres/8.2/lib:/usr/gnu/lib:/usr/sfw/lib"
+
+glib-gettextize --force
+aclocal
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}				\
+            --bindir=%{_bindir}				\
+            --libdir=%{_libdir}				\
+            --sysconfdir=%{_sysconfdir}/jabberd		\
+            --includedir=%{_includedir} 		\
+            --mandir=%{_mandir}				\
+	    --infodir=%{_infodir}			\
+	    --disable-static				\
+	    --enable-shared				\
+	    --enable-mysql				\
+	    --enable-pgsql				\
+	    --enable-sqlite				\
+	    --enable-db
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_libdir}
+%dir %attr (0755, root, sys) %{_datadir}
+%{_mandir}
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+
+%changelog
+* Thu Jul 26 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibgsasl.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,98 @@
+#
+# spec file for package SFElibgsasl
+#
+# includes module(s): libgsasl
+#
+%include Solaris.inc
+
+%define	src_name libgsasl
+%define	src_url	ftp://alpha.gnu.org/pub/gnu/gsasl
+
+Name:                SFElibgsasl
+Summary:             Simple Authentication and Security Layer framework
+Version:             0.2.18
+Source:              %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+BuildRequires: SUNWlibgpg-error-devel
+Requires: SUNWlibgpg-error
+BuildRequires: SUNWlibgcrypt-devel
+Requires: SUNWlibgcrypt
+BuildRequires: SUNWgnutls-devel
+Requires: SUNWgnutls
+BuildRequires: SFElibntlm-devel
+Requires: SFElibntlm
+BuildRequires: SFElibidn-devel
+Requires: SFElibidn
+BuildRequires: SFEgsslib-devel
+Requires: SFEgsslib
+BuildRequires: SFEshishi-devel
+Requires: SFEshishi
+BuildRequires: SFElibtasn1-devel
+Requires: SFElibtasn1
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+rm m4/gettext.m4
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CPPFLAGS="-I/usr/gnu/include"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+export LD_OPTIONS="-L/usr/gnu/lib -R/usr/gnu/lib"
+
+aclocal -I m4 -I gl/m4
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}			\
+            --bindir=%{_bindir}			\
+            --libdir=%{_libdir}			\
+            --sysconfdir=%{_sysconfdir}		\
+            --includedir=%{_includedir} 	\
+            --mandir=%{_mandir}			\
+	    --infodir=%{_infodir}		\
+	    --disable-rpath			\
+	    --disable-static			\
+	    --with-libgss-prefix=/usr/gnu	\
+	    --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
+rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Fri Jul 27 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibntlm.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,76 @@
+#
+# spec file for package SFElibntlm
+#
+# includes module(s): libntlm
+#
+%include Solaris.inc
+
+%define	src_name libntlm
+%define	src_url	http://josefsson.org/libntlm/releases
+
+Name:                SFElibntlm
+Summary:             Microsoft's NTLM authentication library
+Version:             0.3.9
+Source:              %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+aclocal -I m4
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}			\
+            --bindir=%{_bindir}			\
+            --libdir=%{_libdir}			\
+            --sysconfdir=%{_sysconfdir}		\
+            --includedir=%{_includedir} 	\
+            --mandir=%{_mandir}			\
+	    --infodir=%{_infodir}		\
+	    --disable-rpath			\
+	    --disable-static			\
+	    --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Fri Jul 27 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibtasn1.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,105 @@
+#
+# spec file for package SFElibtasn1
+#
+# includes module(s): libtasn1
+#
+%include Solaris.inc
+
+%define	src_name libtasn1
+%define	src_url	http://josefsson.org/gnutls/releases/libtasn1
+
+Name:                SFElibtasn1
+Summary:             Tiny ASN.1 library
+Version:             0.3.10
+Source:              %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+aclocal -I m4 -I gl/m4
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}			\
+            --bindir=%{_bindir}			\
+            --libdir=%{_libdir}			\
+            --sysconfdir=%{_sysconfdir}		\
+            --includedir=%{_includedir} 	\
+            --mandir=%{_mandir}			\
+	    --infodir=%{_infodir}		\
+	    --disable-rpath			\
+	    --disable-static			\
+	    --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
+  echo 'infos="';
+  echo 'libtasn1.info' ;
+  echo '"';
+  echo 'retval=0';
+  echo 'for info in $infos; do';
+  echo '  install-info --info-dir=%{_infodir} %{_infodir}/$info || retval=1';
+  echo 'done';
+  echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%preun
+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
+  echo 'infos="';
+  echo 'libtasn1.info' ;
+  echo '"';
+  echo 'retval=0';
+  echo 'for info in $infos; do';
+  echo '  install-info --info-dir=%{_infodir} %{_infodir}/$info || retval=1';
+  echo 'done';
+  echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/info
+%dir %attr (0755, root, other) %{_datadir}/aclocal
+%{_datadir}/aclocal/*
+%{_mandir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Fri Jul 27 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEshishi.spec	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,120 @@
+#
+# spec file for package SFEshishi
+#
+# includes module(s): shishi
+#
+%include Solaris.inc
+
+%define	src_name shishi
+%define	src_url	http://josefsson.org/shishi/releases
+
+Name:		SFEshishi
+Summary:        Shishi - an implementation of RFC 1510(bis) (Kerberos V5 authentication)
+Version:        0.0.32
+License:	GPL v3+
+Source:         %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1:		shishi-01-min.diff
+Patch2:		shishi-02-include_next.diff
+SUNW_BaseDir:   %{_basedir}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SFEfix-info-dir
+BuildRequires: SFElibidn-devel
+Requires: SFElibidn
+BuildRequires: SFElibtasn1-devel
+Requires: SFElibtasn1
+BuildRequires: SUNWgnutls-devel
+Requires: SUNWgnutls
+
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+
+%package devel
+Summary:                 %{summary} - development files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+rm m4/gettext.m4
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+aclocal -I m4 -I gl/m4
+libtoolize --copy --force 
+automake -a -f
+autoconf -f 
+./configure --prefix=%{_prefix}			\
+            --bindir=%{_bindir}			\
+            --sbindir=%{_sbindir}		\
+            --libdir=%{_libdir}			\
+            --sysconfdir=%{_sysconfdir}		\
+	    --localstatedir=%{_localstatedir}	\
+            --includedir=%{_includedir} 	\
+            --mandir=%{_mandir}			\
+	    --infodir=%{_infodir}		\
+	    --disable-rpath			\
+	    --disable-static			\
+	    --enable-shared
+make -j$CPUS
+%patch2 -p1
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/security/pam_*.*a
+(
+   cd $RPM_BUILD_ROOT%{_libdir}/security
+   mv pam_shishi.so pam_shishi.so.1
+   ln -s pam_shishi.so.1 pam_shishi.so
+)
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+  echo '/usr/sbin/fix-info-dir' | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%preun
+  echo '/usr/sbin/fix-info-dir' | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_sbindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libdir}/security
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/info
+%{_mandir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+%{_localstatedir}
+
+%changelog
+* Fri Jul 27 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fix-info-dir-01-gccism.diff	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,47 @@
+--- fix-info-dir-0.13/trurlib-fid/Makefile.orig	2007-07-27 22:50:44.792077590 +0700
++++ fix-info-dir-0.13/trurlib-fid/Makefile	2007-07-27 22:53:14.904268928 +0700
+@@ -19,10 +19,8 @@
+ 
+ DEFINES  = $(DEF_USE_XMALLOCS) $(DEF_USE_N_ASSERT)
+ CPPFLAGS = -Itrurl $(DEFINES)
+-override CFLAGS += -pedantic -g -Wall -W $(DEFINES) 
+ LDLAGS 	 = 
+-CC 	 = gcc 
+-SHELL 	 = /bin/sh
++SHELL 	 = /bin/bash
+ RANLIB   = ranlib
+ AR	 = ar
+ STRIP	 = strip
+@@ -191,7 +189,7 @@
+ 	$(RANLIB) $@
+ 
+ $(SHARED_LIB): $(SHOBJECTS)
+-	gcc -shared -Wl,-soname=$(SONAME) $(CFLAGS) -o $@ $?
++	$(CC) -G -Wl,-h $(SONAME) $(CFLAGS) -o $@ $?
+ 
+ # for fix-info-dir
+ $(FIXIDIRTARGET): $(FIXIDIROBJS)
+--- fix-info-dir-0.13/Makefile.orig	2007-07-27 22:48:40.109602056 +0700
++++ fix-info-dir-0.13/Makefile	2007-07-27 22:50:05.412390381 +0700
+@@ -10,11 +10,9 @@
+ 
+ CPPFLAGS = -DVERSION=\"$(VERSION)\"
+ CPPFLAGS += -I$(TRURLDIR)
+-override CFLAGS += -g -pedantic -Wall -W 
+ LIBS	= -lz
+ LDLAGS 	= $(TRURLDIR)/narray.a $(LIBS)
+-CC 	= gcc
+-SHELL 	= /bin/sh
++SHELL 	= /bin/bash
+ RANLIB  = ranlib
+ AR	= ar
+ STRIP	= strip
+@@ -37,7 +35,7 @@
+ 	$(MAKE) -C $(TRURLDIR) modules=on symlink narray.a CFLAGS='$(CFLAGS)'
+ 
+ dep:
+-	gcc -MM $(CPPFLAGS) *.c > .depend
++	$(CC) -MM $(CPPFLAGS) *.c > .depend
+ 
+ etags: 
+ 	etags *.c *.h

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jabberd-01-string-conversion.diff	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,11 @@
+--- jabberd-2.1.11/c2s/c2s.c.orig	2007-07-28 08:07:39.413503722 +0700
++++ jabberd-2.1.11/c2s/c2s.c	2007-07-28 08:06:25.820669394 +0700
+@@ -442,7 +442,7 @@
+         case action_CLOSE:
+             log_debug(ZONE, "close action on fd %d", fd->fd);
+ 
+-            log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s, port=%d] disconnect jid=%s, packets: %i", sess->fd->fd, sess->ip, sess->port, sess->jid?jid_full(sess->jid):"unbound", sess->packet_count);
++            log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s, port=%d] disconnect jid=%s, packets: %i", sess->fd->fd, sess->ip, sess->port, sess->jid?jid_full(sess->jid):(const unsigned char)"unbound", sess->packet_count);
+ 
+             /* tell the sm to close their session */
+             if(sess->active)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/shishi-01-min.diff	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,11 @@
+--- shishi-0.0.32/lib/tkts.c.orig	2007-07-27 22:12:06.498009754 +0700
++++ shishi-0.0.32/lib/tkts.c	2007-07-27 22:12:15.394054880 +0700
+@@ -22,6 +22,8 @@
+ 
+ #include "internal.h"
+ 
++#define MIN(a,b) (((a)<(b))?(a):(b))
++
+ struct Shishi_tkts
+ {
+   Shishi *handle;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/shishi-02-include_next.diff	Sat Jul 28 02:07:00 2007 +0000
@@ -0,0 +1,11 @@
+--- shishi-0.0.32/lib/shishi-int.h.orig	2007-07-27 23:47:04.555406556 +0700
++++ shishi-0.0.32/lib/shishi-int.h	2007-07-27 23:47:16.058616649 +0700
+@@ -44,7 +44,7 @@
+      in <inttypes.h> would reinclude us, skipping our contents because
+      _GL_STDINT_H is defined.
+      The include_next requires a split double-inclusion guard.  */
+-# include_next <stdint.h>
++# include <stdint.h>
+ #endif
+ 
+ #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H