Thread: SSL detection bug is back under debian...
Dear Adam,
Jean-Michel reported to me this morning that the SSL menu was empty
under debian builds.
I had a quick look to the build process and it seems that we still have
"-I -DSSL" while in the make all-recursive.
<--- cut here --->
if i386-linux-g++ -DHAVE_CONFIG_H -I. -I. -I..
-DDATA_DIR=\"/usr/share/pgadmin3
/\" -Wall -g -I../src/include -I../src/agent/include -I -DSSL
-I/usr/include/pos
tgresql -I./include -I/usr/lib/wx/include/gtk2ud-2.5 -D__WXDEBUG__
-D__WXGTK__ -
D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I/usr/include
-DDATA_DIR=\"/usr/share/pgad
min3/\" -Wall -g -I../src/include -I../src/agent/include -I -g -O2 -MT
pgAdmin3.
o -MD -MP -MF ".deps/pgAdmin3.Tpo" \
<--- cut here --->
I had a quick look to the makefiles generated by configure and found
that the one in src does something like this:
-I$(WX_HOME)
It seems that this define is empty on my debian host.
I finally did this
$(MAKE) WX_HOME=/usr
instead of a simple $(MAKE) while in the build process. The package
generated did what expected: the SSL menu has now two selectable options
now.
For future reference here is the configure line that I use to build
debian packages (note that I don't use --enable-static):
_deb_wxconfig?=wxgtk2ud-2.5-config
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--with-wx-config=$(_deb_wxconfig) \
--with-pgsql-include=$(_pgsql_inc) \
--with-wx=/usr \
--enable-gtk2 \
--enable-unicode
I will continue to look for this but I think you'll be faster than me
with such issues.
Jean-Michel, if you need a debian version with "true" ssl support just
apt-get source pgadmin3
and edit debian/rules file to replace line 63:
$(MAKE) -----> $(MAKE) WX_HOME=/usr
I can also provide one for you (I built it this morning).
Regards,
Raphaël
Le Jeudi 16 Octobre 2003 12:33, Raphaël Enrici a écrit : > I can also provide one for you (I built it this morning). This was fast! I don't need SSL, it was just a bug report. Will update pgAdmin3 snapshot using apt-get later. Cheers, Jean-Michel
Raphaël Enrici wrote:
> Dear Adam,
>
> Jean-Michel reported to me this morning that the SSL menu was empty
> under debian builds.
> I had a quick look to the build process and it seems that we still
> have "-I -DSSL" while in the make all-recursive.
The attached patch should solve this pesky SSL bug once and for all.
Let me know if you have any problems with it.
ahp
--- pgadmin3/acinclude.m4 2003-10-09 16:40:21.000000000 -0400
+++ pgadmin3.new/acinclude.m4 2003-10-16 08:23:32.000000000 -0400
@@ -93,8 +93,6 @@
fi
])
-CPPFLAGS="$CPPFLAGS -DSSL"
-
#
# Check for libpq libraries and headers
#
@@ -118,6 +116,7 @@
AC_LANG_SAVE
AC_LANG_C
AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])
+ AC_CHECK_LIB(pq, SSL_connect, [pgsql_ssl_libpq=yes], [pgsql_ssl_libpq=np])
AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no])
AC_LANG_RESTORE
if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"
@@ -131,6 +130,11 @@
CPPFLAGS="$PGSQL_OLD_CPPFLAGS"
AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR])
fi
+
+ if test "$pgsql_ssl_libpq" = "yes"
+ then
+ CPPFLAGS="$CPPFLAGS -DSSL"
+ fi
fi
])
Adam H. Pendleton wrote: > Raphaël Enrici wrote: > >> Dear Adam, >> Jean-Michel reported to me this morning that the SSL menu was empty >> under debian builds. >> I had a quick look to the build process and it seems that we still >> have "-I -DSSL" while in the make all-recursive. > > The attached patch should solve this pesky SSL bug once and for all. > Let me know if you have any problems with it. Adam, thank you for this fast released patch. I haven't tried it for now but AFAICS it does not seem to handle the fact that WX_HOME is undef after configure on my system. I think that the real problem comes from this. In fact, SSL was correctly detected but was ignored due to the fact that WX_HOME was empty which gave the '-I -DSSL'. Do you have any idea concerning this ? I'll try your patch tonight or tomorrow. regards, Raphaël > ahp > >------------------------------------------------------------------------ > >--- pgadmin3/acinclude.m4 2003-10-09 16:40:21.000000000 -0400 >+++ pgadmin3.new/acinclude.m4 2003-10-16 08:23:32.000000000 -0400 >@@ -93,8 +93,6 @@ > fi > ]) > >-CPPFLAGS="$CPPFLAGS -DSSL" >- > # > # Check for libpq libraries and headers > # >@@ -118,6 +116,7 @@ > AC_LANG_SAVE > AC_LANG_C > AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no]) >+ AC_CHECK_LIB(pq, SSL_connect, [pgsql_ssl_libpq=yes], [pgsql_ssl_libpq=np]) > AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no]) > AC_LANG_RESTORE > if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes" >@@ -131,6 +130,11 @@ > CPPFLAGS="$PGSQL_OLD_CPPFLAGS" > AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR]) > fi >+ >+ if test "$pgsql_ssl_libpq" = "yes" >+ then >+ CPPFLAGS="$CPPFLAGS -DSSL" >+ fi > fi > ]) > > > > >------------------------------------------------------------------------ > > >---------------------------(end of broadcast)--------------------------- >TIP 1: subscribe and unsubscribe commands go to majordomo@postgresql.org > >
Raphaël Enrici wrote: > Adam, > thank you for this fast released patch. I haven't tried it for now but > AFAICS it does not seem to handle the fact that WX_HOME is undef after > configure on my system. I think that the real problem comes from this. > In fact, SSL was correctly detected but was ignored due to the fact > that WX_HOME was empty which gave the '-I -DSSL'. Do you have any idea > concerning this ? I'll try your patch tonight or tomorrow. > I've been looking at this -I$(WX_HOME) code for some time now, and I can't figure out why it's there, or what it is supposed to do (I mean I know ostensibly what it's supposed to do, but that's obviously not what it's doing), so I've removed it. The following patch gets rid of the offender. If anyone experiences any problems, please let me know. ahp --- pgadmin3/src/Makefile.am 2003-10-06 05:49:40.000000000 -0400 +++ pgadmin3.new/src/Makefile.am 2003-10-16 09:54:11.000000000 -0400 @@ -162,5 +162,5 @@ ui/tr_TR/wxstd.mo \ ui/zh_CN/wxstd.mo -AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(WX_HOME) -AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(WX_HOME) +AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include +AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
Hi Adam. It is very Good.! It works very effectively in accordance with patch. I was tried with FreeBSD. regards, Hiroshi Saito ----- Original Message ----- From: "Adam H. Pendleton" <fmonkey@fmonkey.net> > Raphaël Enrici wrote: > > > Adam, > > thank you for this fast released patch. I haven't tried it for now but > > AFAICS it does not seem to handle the fact that WX_HOME is undef after > > configure on my system. I think that the real problem comes from this. > > In fact, SSL was correctly detected but was ignored due to the fact > > that WX_HOME was empty which gave the '-I -DSSL'. Do you have any idea > > concerning this ? I'll try your patch tonight or tomorrow. > > > I've been looking at this -I$(WX_HOME) code for some time now, and I > can't figure out why it's there, or what it is supposed to do (I mean I > know ostensibly what it's supposed to do, but that's obviously not what > it's doing), so I've removed it. The following patch gets rid of the > offender. If anyone experiences any problems, please let me know. > > ahp
Dave, I didn't try the latest Adam's patch, but it does what I wanted to do by hand... If nobody thinks the -I$(WX_HOME) should be included in the Makefile.am file then I think it should be applied (at least the latest one). Can you handle this please? One more time, thanks for your patches Adam. regards, Raphaël Hiroshi Saito wrote: >Hi Adam. >It is very Good.! >It works very effectively in accordance with patch. >I was tried with FreeBSD. > >regards, >Hiroshi Saito > >----- Original Message ----- >From: "Adam H. Pendleton" <fmonkey@fmonkey.net> > > > > >>Raphaël Enrici wrote: >> >> >> >>>Adam, >>>thank you for this fast released patch. I haven't tried it for now but >>>AFAICS it does not seem to handle the fact that WX_HOME is undef after >>>configure on my system. I think that the real problem comes from this. >>>In fact, SSL was correctly detected but was ignored due to the fact >>>that WX_HOME was empty which gave the '-I -DSSL'. Do you have any idea >>>concerning this ? I'll try your patch tonight or tomorrow. >>> >>> >>> >>I've been looking at this -I$(WX_HOME) code for some time now, and I >>can't figure out why it's there, or what it is supposed to do (I mean I >>know ostensibly what it's supposed to do, but that's obviously not what >>it's doing), so I've removed it. The following patch gets rid of the >>offender. If anyone experiences any problems, please let me know. >> >>ahp >> >> > > >
Thanks, patch applied. > -----Original Message----- > From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net] > Sent: 16 October 2003 13:26 > To: Raphaël Enrici > Cc: jm@poure.com; pgadmin-hackers > Subject: Re: [pgadmin-hackers] SSL detection bug is back > under debian... > > Raphaël Enrici wrote: > > > Dear Adam, > > > > Jean-Michel reported to me this morning that the SSL menu was empty > > under debian builds. > > I had a quick look to the build process and it seems that we still > > have "-I -DSSL" while in the make all-recursive. > > The attached patch should solve this pesky SSL bug once and for all. > Let me know if you have any problems with it. > > ahp >
Thanks, patch applied. > -----Original Message----- > From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net] > Sent: 16 October 2003 14:56 > To: Raphaël Enrici > Cc: pgadmin-hackers > Subject: Re: [pgadmin-hackers] SSL detection bug is back > under debian... > > Raphaël Enrici wrote: > > > Adam, > > thank you for this fast released patch. I haven't tried it > for now but > > AFAICS it does not seem to handle the fact that WX_HOME is > undef after > > configure on my system. I think that the real problem comes > from this. > > In fact, SSL was correctly detected but was ignored due to the fact > > that WX_HOME was empty which gave the '-I -DSSL'. Do you > have any idea > > concerning this ? I'll try your patch tonight or tomorrow. > > > I've been looking at this -I$(WX_HOME) code for some time > now, and I can't figure out why it's there, or what it is > supposed to do (I mean I know ostensibly what it's supposed > to do, but that's obviously not what it's doing), so I've > removed it. The following patch gets rid of the offender. > If anyone experiences any problems, please let me know. > > ahp >