OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Jun-2004 11:31:04
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/analog analog.spec
Removed files:
openpkg-src/analog analog.patch
Log:
fix security problems by now using the external GD, PNG, Zlib and PCRE
libraries. Notice, Analog still compiles the local copy source files,
but they are #ifdef'ed internally except for some legacy (and
acceptable) gdFontFixed stuff
Summary:
Revision Changes Path
1.2 +0 -22 openpkg-src/analog/analog.patch
1.40 +6 -5 openpkg-src/analog/analog.spec
____________________________________________________________________________
rm -f openpkg-src/analog/analog.patch <<'@@ .'
Index: openpkg-src/analog/analog.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/analog/analog.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 analog.spec
--- openpkg-src/analog/analog.spec 29 Apr 2004 15:06:52 -0000 1.39
+++ openpkg-src/analog/analog.spec 29 Jun 2004 09:31:03 -0000 1.40
@@ -34,17 +34,18 @@
Group: Web
License: GPL
Version: 5.32
-Release: 20040429
+Release: 20040629
# list of sources
Source0: http://www.analog.cx/analog-%{version}.tar.gz
-Patch0: analog.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: gd, png, jpeg, zlib, pcre
+PreReq: gd, png, jpeg, zlib, pcre
AutoReq: no
AutoReqProv: no
@@ -63,17 +64,17 @@
%prep
%setup -q
- %patch
%build
cd src
- libs="-lm"
+ libs="-lgd -lpng -ljpeg -lz -lpcre -lm"
case "%{l_platform -t}" in
*-sunos5* ) libs="-lnsl $libs" ;;
esac
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
- CFLAGS='%{l_cflags -O}
-DDEFAULTCONFIGFILE=\"%{l_prefix}/etc/analog/analog.cfg\"' \
+ CFLAGS='%{l_cflags -O} %{l_cppflags}
-DDEFAULTCONFIGFILE=\"%{l_prefix}/etc/analog/analog.cfg\"' \
+ DEFS="-DHAVE_GD -DHAVE_ZLIB -DHAVE_PCRE" \
LIBS="$libs"
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
