[SCM] GNU gsasl branch, master, updated. gsasl-1-6-0-7-g200dfec

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=200dfec379490dc9cbbef90b8cb9ebc1f2e928b4

The branch, master has been updated
       via  200dfec379490dc9cbbef90b8cb9ebc1f2e928b4 (commit)
      from  fe428546439d6a92c7590b3c0e3b6bd512247ac2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 200dfec379490dc9cbbef90b8cb9ebc1f2e928b4
Author: Simon Josefsson <address@hidden>
Date:   Sun May 1 17:17:09 2011 +0200

    build: Added MinGW build script for Windows binaries, windows/gsasl4win.mk.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore           |   13 ++++
 NEWS                 |    2 +
 windows/gsasl4win.mk |  152 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 167 insertions(+), 0 deletions(-)
 create mode 100644 windows/gsasl4win.mk

diff --git a/.gitignore b/.gitignore
index 182f337..5914425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -798,3 +798,16 @@ tests/symbols
 tests/symbols.o
 tests/utils.lo
 tests/utils.o
+windows/build-x64/
+windows/build-x86-kfw322/
+windows/build-x86/
+windows/dist/
+windows/gsasl-*-x64.zip
+windows/gsasl-*-x86-kfw322.zip
+windows/gsasl-*-x86.zip
+windows/inst-x64/
+windows/inst-x86-kfw322/
+windows/inst-x86/
+windows/kfw322x86/
+windows/src/
+windows/tmp/
diff --git a/NEWS b/NEWS
index b09cb55..b95cc24 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ The old M4 files associated with 0.17 caused problems on 
Solaris,
 which will hopefully be fixed with this.  Reported by Dagobert
 Michelsen <address@hidden>.
 
+** build: Added MinGW build script for Windows binaries, windows/gsasl4win.mk.
+
 ** SAML changes reverted, will be kept on a separate branch.
 
 * Version 1.7.0 (released 2010-10-22) [alpha]
diff --git a/windows/gsasl4win.mk b/windows/gsasl4win.mk
new file mode 100644
index 0000000..a60657e
--- /dev/null
+++ b/windows/gsasl4win.mk
@@ -0,0 +1,152 @@
+# gsasl4win.mk --- build GNU SASL for Windows
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011  Simon Josefsson
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+GSASL_DLL_VERSION=7
+
+all:
+       @echo 'Usage examples:'
+       @echo '  make -f gsasl4win.mk gsasl4win VERSION=1.6.1'
+       @echo '  make -f gsasl4win.mk gsasl4win32 VERSION=1.6.1'
+       @echo '  make -f gsasl4win.mk gsasl4win64 VERSION=1.6.1'
+       @echo '  make -f gsasl4win.mk gsasl4win32kfw322 VERSION=1.6.1'
+
+clean:
+       rm -rf src build-x86 build-x64 inst-x86 inst-x64 kfw322x86 kfw323x86
+
+upload:
+       gnupload --to ftp.gnu.org:gsasl *.zip *.sig
+       cp *.zip *.sig ../../releases/gsasl/
+
+gsasl4win: gsasl4win32 gsasl4win64 gsasl4win32kfw322
+gsasl4win32: gsasl-$(VERSION)-x86.zip
+gsasl4win64: gsasl-$(VERSION)-x64.zip
+gsasl4win32kfw322: gsasl-$(VERSION)-x86-kfw322.zip
+
+# GNU SASL
+
+dist/gsasl-$(VERSION).tar.gz:
+       rm -rf tmp
+       mkdir tmp
+       cd tmp && wget -q ftp://ftp.gnu.org/gnu/gsasl/gsasl-$(VERSION).tar.gz 
ftp://ftp.gnu.org/gnu/gsasl/gsasl-$(VERSION).tar.gz.sig
+       gpg tmp/gsasl-$(VERSION).tar.gz.sig
+       -mkdir dist
+       mv tmp/gsasl-$(VERSION).tar.gz tmp/gsasl-$(VERSION).tar.gz.sig dist/
+       rm -rf tmp
+
+src/gsasl-$(VERSION)/configure: dist/gsasl-$(VERSION).tar.gz
+       -mkdir src
+       cd src && tar xfz ../dist/gsasl-$(VERSION).tar.gz
+
+# x86 vanilla
+
+build-x86/gsasl-$(VERSION)/Makefile: src/gsasl-$(VERSION)/configure
+       rm -rf build-x86/gsasl-$(VERSION)
+       mkdir -p build-x86/gsasl-$(VERSION) && \
+       cd build-x86/gsasl-$(VERSION) && \
+       ../../src/gsasl-$(VERSION)/configure --host=i686-w64-mingw32 
--build=i686-pc-linux-gnu --prefix=$(PWD)/inst-x86 --without-libgcrypt 
--disable-obsolete
+
+inst-x86/bin/libgsasl-$(GSASL_DLL_VERSION).dll: 
build-x86/gsasl-$(VERSION)/Makefile
+       make -C build-x86/gsasl-$(VERSION) install
+       make -C build-x86/gsasl-$(VERSION)/tests check
+
+gsasl-$(VERSION)-x86.zip: inst-x86/bin/libgsasl-$(GSASL_DLL_VERSION).dll
+       rm -f gsasl-$(VERSION)-x86.zip
+       cd inst-x86 && zip -r ../gsasl-$(VERSION)-x86.zip *
+
+# x64 vanilla
+
+build-x64/gsasl-$(VERSION)/Makefile: src/gsasl-$(VERSION)/configure
+       rm -rf build-x64/gsasl-$(VERSION)
+       mkdir -p build-x64/gsasl-$(VERSION) && \
+       cd build-x64/gsasl-$(VERSION) && \
+       ../../src/gsasl-$(VERSION)/configure --host=i686-w64-mingw32 
--build=i686-pc-linux-gnu --prefix=$(PWD)/inst-x64 --without-libgcrypt 
--disable-obsolete
+
+inst-x64/bin/libgsasl-$(GSASL_DLL_VERSION).dll: 
build-x64/gsasl-$(VERSION)/Makefile
+       make -C build-x64/gsasl-$(VERSION) install
+
+gsasl-$(VERSION)-x64.zip: inst-x64/bin/libgsasl-$(GSASL_DLL_VERSION).dll
+       rm -f gsasl-$(VERSION)-x64.zip
+       cd inst-x64 && zip -r ../gsasl-$(VERSION)-x64.zip *
+
+# x86 KfW 3.2.2 flavor
+
+build-x86-kfw322/gsasl-$(VERSION)/Makefile: src/gsasl-$(VERSION)/configure 
kfw322x86/kfw-3-2-2-final/inc/krb5/win-mac.h install-kfw322
+       rm -rf build-x86-kfw322/gsasl-$(VERSION)
+       mkdir -p build-x86-kfw322/gsasl-$(VERSION) && \
+       cd build-x86-kfw322/gsasl-$(VERSION) && \
+       lt_cv_deplibs_check_method=pass_all 
../../src/gsasl-$(VERSION)/configure --host=i686-w64-mingw32 
--build=i686-pc-linux-gnu --prefix=$(PWD)/inst-x86-kfw322 --without-libgcrypt 
--disable-obsolete --with-gssapi-impl=kfw 
LDFLAGS="-L$(PWD)/kfw322x86/kfw-3-2-2-final/lib/i386" 
CPPFLAGS="-I$(PWD)/kfw322x86/kfw-3-2-2-final/inc/krb5 -DSSIZE_T_DEFINED"
+
+inst-x86-kfw322/bin/libgsasl-$(GSASL_DLL_VERSION).dll: 
build-x86-kfw322/gsasl-$(VERSION)/Makefile
+       make -C build-x86-kfw322/gsasl-$(VERSION) install
+       make -C build-x86-kfw322/gsasl-$(VERSION)/tests check
+
+gsasl-$(VERSION)-x86-kfw322.zip: 
inst-x86-kfw322/bin/libgsasl-$(GSASL_DLL_VERSION).dll
+       rm -f gsasl-$(VERSION)-x86-kfw322.zip
+       cd inst-x86-kfw322 && zip -r ../gsasl-$(VERSION)-x86-kfw322.zip *
+
+# x86 KfW 3.2.3 flavor (not built right now due to crashes)
+
+build-x86-kfw323/gsasl-$(VERSION)/Makefile: src/gsasl-$(VERSION)/configure 
kfw323x86/kfw-3-2-3-final/inc/krb5/win-mac.h install-x86-kfw323
+       rm -rf build-x86-kfw323/gsasl-$(VERSION)
+       mkdir -p build-x86-kfw323/gsasl-$(VERSION) && \
+       cd build-x86-kfw323/gsasl-$(VERSION) && \
+       lt_cv_deplibs_check_method=pass_all 
../../src/gsasl-$(VERSION)/configure --host=i686-w64-mingw32 
--build=i686-pc-linux-gnu --prefix=$(PWD)/inst-x86-kfw323 --without-libgcrypt 
--disable-obsolete --with-gssapi-impl=kfw 
LDFLAGS="-L$(PWD)/kfw323x86/kfw-3-2-3-final/lib/i386" 
CPPFLAGS="-I$(PWD)/kfw323x86/kfw-3-2-3-final/inc/krb5 -DSSIZE_T_DEFINED"
+
+inst-x86-kfw323/bin/libgsasl-$(GSASL_DLL_VERSION).dll: 
build-x86-kfw323/gsasl-$(VERSION)/Makefile
+       make -C build-x86-kfw323/gsasl-$(VERSION) install
+       make -C build-x86-kfw323/gsasl-$(VERSION)/tests check
+
+gsasl-$(VERSION)-x86-kfw323.zip: 
inst-x86-kfw323/bin/libgsasl-$(GSASL_DLL_VERSION).dll
+       rm -f gsasl-$(VERSION)-x86-kfw323.zip
+       cd inst-x86-kfw323 && zip -r ../gsasl-$(VERSION)-x86-kfw323.zip *
+
+# KfW 3.2.2
+
+install-kfw322:
+       rm -rf tmp && \
+       mkdir tmp && \
+       cd tmp && \
+       wget http://web.mit.edu/kerberos/dist/kfw/3.2/kfw-3.2.2/kfw-3-2-2.zip 
&& \
+       unzip kfw-3-2-2.zip && \
+       cp -v kfw-3-2-2-final/bin/i386/*.dll 
$(HOME)/.wine/drive_c/windows/system32/
+
+dist/kfw-3-2-2-sdk.zip:
+       -mkdir dist
+       cd dist && wget 
http://web.mit.edu/kerberos/dist/kfw/3.2/kfw-3.2.2/kfw-3-2-2-sdk.zip
+
+kfw322x86/kfw-3-2-2-final/inc/krb5/win-mac.h: dist/kfw-3-2-2-sdk.zip
+       -mkdir kfw322x86
+       cd kfw322x86 && unzip ../dist/kfw-3-2-2-sdk.zip
+       perl -pi -e 's,sys\\,sys/,' kfw322x86/kfw-3-2-2-final/inc/krb5/win-mac.h
+
+# KfW 3.2.3 x86
+
+install-x86-kfw323:
+       rm -rf tmp && \
+       mkdir tmp && \
+       cd tmp && \
+       wget 
http://web.mit.edu/kerberos/dist/kfw/3.2/kfw-3.2.3-alpha1/kfw-3-2-3-i386.zip && 
\
+       unzip kfw-3-2-3-i386.zip && \
+       cp -v kfw-3-2-3-final/bin/i386/*.dll 
$(HOME)/.wine/drive_c/windows/system32/
+
+dist/kfw-3-2-3-i386-sdk.zip:
+       -mkdir dist
+       cd dist && wget 
http://web.mit.edu/kerberos/dist/kfw/3.2/kfw-3.2.3-alpha1/kfw-3-2-3-i386-sdk.zip
+
+kfw323x86/kfw-3-2-3-final/inc/krb5/win-mac.h: dist/kfw-3-2-3-i386-sdk.zip
+       -mkdir kfw323x86
+       cd kfw323x86 && unzip ../dist/kfw-3-2-3-i386-sdk.zip
+       perl -pi -e 's,sys\\,sys/,' kfw323x86/kfw-3-2-3-final/inc/krb5/win-mac.h


hooks/post-receive
-- 
GNU gsasl