- build against external/internal neon.
CVS patchset: 7692 CVS date: 2005/01/09 17:48:19
This commit is contained in:
jbj
parent
a35472d849
commit
5732d3daae
1
CHANGES
1
CHANGES
|
|
@ -8,6 +8,7 @@
|
|||
- upgrade to file-4.12 internal.
|
||||
- mac os x patches (#131943,#131944,#132924,#132926).
|
||||
- mac os x patches (#133611, #133612, #134637).
|
||||
- build against external/internal neon.
|
||||
|
||||
4.3.3 -> 4.4:
|
||||
- pentium3/pentium4 arch support (pluto@PLD).
|
||||
|
|
|
|||
30
configure.ac
30
configure.ac
|
|
@ -374,6 +374,8 @@ dnl
|
|||
|
||||
dnl Checks for libraries.
|
||||
|
||||
#=================
|
||||
# Check for beecrypt library. Prefer external, otherwise internal.
|
||||
WITH_ELFUTILS_SUBDIR=
|
||||
WITH_LIBELF_INCLUDE=
|
||||
WITH_LIBELF_LIB=
|
||||
|
|
@ -408,6 +410,8 @@ AC_CHECK_HEADER([dwarf.h], [
|
|||
])
|
||||
AC_SUBST(WITH_LIBDWARF_INCLUDE)
|
||||
|
||||
#=================
|
||||
# Check for beecrypt library. Prefer external, otherwise internal.
|
||||
WITH_BEECRYPT_SUBDIR=
|
||||
WITH_BEECRYPT_INCLUDE=
|
||||
WITH_BEECRYPT_LIB=
|
||||
|
|
@ -432,6 +436,32 @@ AC_SUBST(WITH_BEECRYPT_SUBDIR)
|
|||
AC_SUBST(WITH_BEECRYPT_INCLUDE)
|
||||
AC_SUBST(WITH_BEECRYPT_LIB)
|
||||
|
||||
#=================
|
||||
# Check for neon library. Prefer external, otherwise internal.
|
||||
WITH_NEON_SUBDIR=
|
||||
WITH_NEON_INCLUDE=
|
||||
WITH_NEON_LIB=
|
||||
AC_CHECK_HEADER([neon/ne_session.h], [
|
||||
AC_CHECK_LIB(neon, ne_session_create, [
|
||||
AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
|
||||
AC_CHECK_LIB(neon, ne_get_response_header, [
|
||||
AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
|
||||
])
|
||||
WITH_NEON_INCLUDE="-I/usr/include/neon"
|
||||
WITH_NEON_LIB="-lneon"
|
||||
])
|
||||
], [
|
||||
if test -d neon ; then
|
||||
AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
|
||||
WITH_NEON_SUBDIR=neon
|
||||
WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
|
||||
WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
|
||||
fi
|
||||
])
|
||||
AC_SUBST(WITH_NEON_SUBDIR)
|
||||
AC_SUBST(WITH_NEON_INCLUDE)
|
||||
AC_SUBST(WITH_NEON_LIB)
|
||||
|
||||
AC_CHECK_FUNC(setreuid, [], [
|
||||
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Name: rpm
|
|||
%define version @VERSION@
|
||||
Version: %{version}
|
||||
%{expand: %%define rpm_version %{version}}
|
||||
Release: 0.5
|
||||
Release: 0.7
|
||||
Group: System Environment/Base
|
||||
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
|
||||
License: GPL
|
||||
|
|
@ -496,6 +496,9 @@ exit 0
|
|||
%{__includedir}/popt.h
|
||||
|
||||
%changelog
|
||||
* Sun Jan 9 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.7
|
||||
- build against external/internal neon.
|
||||
|
||||
* Tue Jan 4 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.6
|
||||
- mac os x patches (#131943,#131944,#132924,#132926).
|
||||
- mac os x patches (#133611, #133612, #134637).
|
||||
|
|
|
|||
|
|
@ -829,10 +829,12 @@ static void hexdump(const unsigned char * buf, ssize_t len)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void davAcceptRanges(void * userdata, const char * value)
|
||||
static void davAcceptRanges(void * userdata, /*@null@*/ const char * value)
|
||||
/*@modifies userdata @*/
|
||||
{
|
||||
urlinfo u = userdata;
|
||||
|
||||
if (!(u && value)) return;
|
||||
if (_dav_debug < 0)
|
||||
fprintf(stderr, "*** u %p Accept-Ranges: %s\n", u, value);
|
||||
if (!strcmp(value, "bytes"))
|
||||
|
|
@ -841,18 +843,23 @@ fprintf(stderr, "*** u %p Accept-Ranges: %s\n", u, value);
|
|||
u->httpHasRange = 0;
|
||||
}
|
||||
|
||||
#if !defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
|
||||
static void davAllHeaders(void * userdata, const char * value)
|
||||
{
|
||||
FD_t ctrl = userdata;
|
||||
|
||||
if (!(ctrl && value)) return;
|
||||
if (_dav_debug)
|
||||
fprintf(stderr, "<- %s\n", value);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void davContentLength(void * userdata, const char * value)
|
||||
static void davContentLength(void * userdata, /*@null@*/ const char * value)
|
||||
/*@modifies userdata @*/
|
||||
{
|
||||
FD_t ctrl = userdata;
|
||||
|
||||
if (!(ctrl && value)) return;
|
||||
if (_dav_debug < 0)
|
||||
fprintf(stderr, "*** fd %p Content-Length: %s\n", ctrl, value);
|
||||
/*@-unrecog@*/
|
||||
|
|
@ -860,10 +867,12 @@ fprintf(stderr, "*** fd %p Content-Length: %s\n", ctrl, value);
|
|||
/*@=unrecog@*/
|
||||
}
|
||||
|
||||
static void davConnection(void * userdata, const char * value)
|
||||
static void davConnection(void * userdata, /*@null@*/ const char * value)
|
||||
/*@modifies userdata @*/
|
||||
{
|
||||
FD_t ctrl = userdata;
|
||||
|
||||
if (!(ctrl && value)) return;
|
||||
if (_dav_debug < 0)
|
||||
fprintf(stderr, "*** fd %p Connection: %s\n", ctrl, value);
|
||||
if (!strcasecmp(value, "close"))
|
||||
|
|
@ -917,12 +926,14 @@ assert(ctrl->req != NULL);
|
|||
|
||||
ne_set_request_private(ctrl->req, "fd", ctrl);
|
||||
|
||||
#if !defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
|
||||
ne_add_response_header_catcher(ctrl->req, davAllHeaders, ctrl);
|
||||
|
||||
ne_add_response_header_handler(ctrl->req, "Content-Length",
|
||||
davContentLength, ctrl);
|
||||
ne_add_response_header_handler(ctrl->req, "Connection",
|
||||
davConnection, ctrl);
|
||||
#endif
|
||||
|
||||
if (!strcmp(httpCmd, "PUT")) {
|
||||
#ifdef NOTYET /* XXX HACK no wr_chunked until libneon supports */
|
||||
|
|
@ -937,8 +948,10 @@ assert(ctrl->req != NULL);
|
|||
} else {
|
||||
/* HACK: possible Last-Modified: Tue, 02 Nov 2004 14:29:36 GMT */
|
||||
/* HACK: possible ETag: "inode-size-mtime" */
|
||||
#if !defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
|
||||
ne_add_response_header_handler(ctrl->req, "Accept-Ranges",
|
||||
davAcceptRanges, u);
|
||||
#endif
|
||||
/* HACK: possible Transfer-Encoding: on GET. */
|
||||
|
||||
/* HACK: other errors may need retry too. */
|
||||
|
|
@ -954,6 +967,16 @@ assert(ctrl->req != NULL);
|
|||
if (_dav_debug < 0)
|
||||
fprintf(stderr, "*** davReq(%p,%s,\"%s\") exit sess %p req %p rc %d\n", ctrl, httpCmd, (httpArg ? httpArg : ""), u->sess, ctrl->req, rc);
|
||||
|
||||
#if defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
|
||||
davContentLength(ctrl,
|
||||
ne_get_response_header(ctrl->req, "Content-Length"));
|
||||
davConnection(ctrl,
|
||||
ne_get_response_header(ctrl->req, "Connection"));
|
||||
if (strcmp(httpCmd, "PUT"))
|
||||
davAcceptRanges(u,
|
||||
ne_get_response_header(ctrl->req, "Accept-Ranges"));
|
||||
#endif
|
||||
|
||||
ctrl = fdLink(ctrl, "open data (davReq)");
|
||||
return 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
#/*! \page config_rpmpopt Default configuration: /usr/lib/rpm/rpmpopt-@VERSION@
|
||||
#/*! \page config_rpmpopt Default configuration: @RPMCONFIGDIR@/rpmpopt-@VERSION@
|
||||
# \verbatim
|
||||
#
|
||||
# @RPMCONFIGDIR@/@configure_input@
|
||||
# $Id: rpmpopt.in,v 2.39.2.1 2005/01/09 17:48:19 jbj Exp $
|
||||
#
|
||||
# This file *should not be modified*. Local customizations
|
||||
# belong in /etc/popt, not here. This file will be replaced
|
||||
# whenever a new version of RPM is installed.
|
||||
|
|
|
|||
3
rpmrc.in
3
rpmrc.in
|
|
@ -1,7 +1,8 @@
|
|||
#/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
|
||||
# \verbatim
|
||||
#
|
||||
# $Id: rpmrc.in,v 2.65.2.2 2005/01/04 17:46:10 jbj Exp $
|
||||
# @RPMCONFIGDIR@/@configure_input@
|
||||
# $Id: rpmrc.in,v 2.65.2.3 2005/01/09 17:48:19 jbj Exp $
|
||||
#
|
||||
# This is a global RPM configuration file. All changes made here will
|
||||
# be lost when the rpm package is upgraded. Any per-system configuration
|
||||
|
|
|
|||
Loading…
Reference in New Issue