web
/
surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #22

Browse Source
master
Marc Wäckerlin 14 years ago
parent 63070140f8
commit 9ce6f20adc
11 changed files with 103 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      makefile
  2. 21
      openssl-act-engine/configure.in
  3. 14
      qt/makefile
  4. 22
      swisssurfer/configure.in
  5. 22
      swisssurfer/doc/makefile.am
  6. 3
      swisssurfer/src/makefile.am
  7. 2
      swisssurfer/src/smartcardauth.cxx
  8. 4
      swisssurfer/src/swisssurfer_de.ts
  9. 4
      swisssurfer/src/swisssurfer_en.ts
  10. 4
      swisssurfer/src/swisssurfer_fr.ts
  11. 4
      swisssurfer/src/swisssurfer_it.ts

31
makefile
Unescape View File

@ -0,0 +1,31 @@
QT=$(shell ls -1 qt | sed -n 's/\(qt-.*\)\.tar\.gz/\1/p')
all: openssl-act-engine qt swisssurfer
clean:
-cd openssl-act-engine && make maintainer-clean
-cd swisssurfer && make maintainer-clean
-cd qt && make clean
maintainer-clean: clean
-cd qt && make maintainer-clean
install:
32bit:
64bit:
openssl-act-engine:
cd $@ && ./bootstrap.sh && ./configure && make
qt:
cd $@ && make
swisssurfer: qt openssl-act-engine
cd $@ && ./bootstrap.sh && \
QMAKE=../../qt/${QT}/bin/qmake ./configure && make
.PHONY: openssl-act-engine qt swisssurfer 32bit 64bit all install \
clean maintainer-clean

21
openssl-act-engine/configure.in
Unescape View File

@ -5,13 +5,14 @@
# init
AC_INIT([README])
PACKAGENAME=openssl-act-engine
SRC_DIR=src
TST_DIR=
DOC_DIR=doc
m4_define(x_packagename, openssl-act-engine)
m4_define(x_major, 1)
m4_define(x_minor, 0)
PACKAGENAME=x_packagename
MAJOR=x_major
MINOR=x_minor
@ -24,7 +25,7 @@ for path in . .. ../..; do
fi
done
AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
# files to create
AC_CONFIG_FILES(makefile src/makefile doc/makefile doc/doxyfile)
@ -59,6 +60,22 @@ AC_PROG_LIBTOOL
AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
AC_CHECK_PROG(have_dot, dot, yes, no)
case ${host} in
(*linux*) case "${host}" in
(*i386*) LDFLAGS+="-L../../actlibrary/Ubuntu-9-i686/Release"
;;
(*i686|x86_64*) LDFLAGS+="-L../../actlibrary/OpenSUSE-11-x86_64/Release"
;;
(*) AC_MSG_ERROR([Unknown Linux Host: $host])
;;
esac
;;
(*mingw*) LDFLAGS+="-L../../actlibrary/mingw32-i586/Release"
;;
(*) AC_MSG_ERROR([Unknown Host: $host])
;;
esac
AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic],
[enable all warnings and checks, abort on warnings])],

14
qt/makefile
Unescape View File

@ -0,0 +1,14 @@
QT=$(shell ls -1 | sed -n 's/\(qt-.*\)\.tar\.gz/\1/p')
all: ${QT}
cd $< && (echo "yes" | ./configure -opensource)
cd $< && make
maintainer-clean: clean
-rm -rf ${QT}
${QT}: ${QT}.tar.gz
tar xzvf $<
cd $@ && patch -p1 < ../patch/qt-sources-patch.diff
.PHONY: maintainer-clean all

22
swisssurfer/configure.in
Unescape View File

@ -1,24 +1,32 @@
# init
AC_INIT([README])
PACKAGENAME=swisssurfer
SRC_DIR=src
TST_DIR=
DOC_DIR=doc
m4_define(x_packagename, swisssurfer)
m4_define(x_major, 1)
m4_define(x_minor, 0)
m4_define(x_least, 0)
AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
PACKAGENAME=x_packagename
MAJOR=x_major
MINOR=x_minor
LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then
LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p')
break;
fi
done
AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
# files to create
AC_CONFIG_FILES(makefile
src/makefile src/qmake.pro src/languages.qrc
doc/doxyfile doc/makefile)
# copy M4 to shell
MAJOR=x_major
MINOR=x_minor
LEAST=x_least
AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(LEAST)

22
swisssurfer/doc/makefile.am
Unescape View File

@ -5,8 +5,8 @@
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
#develdir = ${pkgdatadir}/doc/devel
#devel_DATA = devel/index.html
develdir = ${pkgdatadir}/doc
devel_DATA = html/index.html
ALL_SRC = ${top_srcdir}/src/*.[ch]xx
# ${top_srcdir}/src/*.doc
@ -21,7 +21,7 @@ all: ${DIRS}
deps = ${top_srcdir}/COPYING ${top_srcdir}/README \
${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
html: ${ALL_SRC} doxyfile ${deps}
${devel_DATA}: ${ALL_SRC} doxyfile ${deps}
doxygen doxyfile
if PEDANTIC
test \! -s doxygen.errors
@ -36,13 +36,13 @@ MAINTAINERCLEANFILES = makefile.in
distclean-local:
- rm -r html latex
#dist-hook:
# cp html/* ${develdir}
dist-hook: ${devel_DATA}
cp -r html ${distdir}/
#install-data-hook:
# chmod -R u+w ${pkgdatadir}/doc
# cp devel/* ${develdir}
install-data-hook:
chmod -R u+w ${develdir}
cp -r html/* ${develdir}/
#uninstall-hook:
# chmod -R u+w ${pkgdatadir}/doc
# rm -rf ${develdir}
uninstall-hook:
-chmod -R u+w ${develdir}
-rm -rf ${develdir}/*

3
swisssurfer/src/makefile.am
Unescape View File

@ -17,6 +17,9 @@ QMAKE_TARGET = @PACKAGENAME@
TARGETS = ${QMAKE_TARGET}
EXTRA_SCRIPTS= swisssurfer
bin_SCRIPTS = ${EXTRA_SCRIPTS}
if BUILD_WIN
QMAKE_MAKEFILE_WIN = makefile.win.qmake
QMAKE_OPTIONS_WIN = ${QMAKE_OPTIONS} -win32 -spec cross-mingw-g++

2
swisssurfer/src/smartcardauth.cxx
Unescape View File

@ -58,6 +58,7 @@ SmartCardAuth::~SmartCardAuth() {
std::map<ssl_ctx_st*, QSslSocket*> sockets;
int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
if (!e) return 0;
static std::set<QString> allowedUrls;
std::map<ssl_ctx_st*, QSslSocket*>::iterator it(sockets.find(ssl->ctx));
if (it!=sockets.end()) {
@ -153,6 +154,7 @@ int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
void SmartCardAuth::extendedContextInitialization(ssl_ctx_st *ctx,
QSslSocket *socket)
{
if (!e) return;
bool result = false;
if(!certs_found)

4
swisssurfer/src/swisssurfer_de.ts
Unescape View File

@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_en.ts
Unescape View File

@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_fr.ts
Unescape View File

@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

4
swisssurfer/src/swisssurfer_it.ts
Unescape View File

@ -505,12 +505,12 @@ Try: %1 --help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="65"/>
<location filename="smartcardauth.cxx" line="66"/>
<source>Send Authentication?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="smartcardauth.cxx" line="66"/>
<location filename="smartcardauth.cxx" line="67"/>
<source>Do you want to authenticate yourself to %1?</source>
<translation type="unfinished"></translation>
</message>

Write Preview
Loading…
Cancel
Save