Date: Sat, 26 Oct 2013 16:38:12 GMT From: Gustav Bergquist <gusber@kth.se> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183340: ports/ftp/curl curl-7.33.0 fails to apply patches Message-ID: <201310261638.r9QGcCxo042779@oldred.freebsd.org> Resent-Message-ID: <201310261640.r9QGe0lW091274@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183340
>Category: ports
>Synopsis: ports/ftp/curl curl-7.33.0 fails to apply patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 26 16:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Gustav Bergquist
>Release: FreeBSD 9.1-RELEASE
>Organization:
Royal Institue of Technology
>Environment:
FreeBSD plasma 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
latest svn ports tree (rev 331711) contains invalid patch files for curl 7.33.0
patches fail to apply and build stops.
Following files are affected:
/usr/ports/ftp/curl/files/patch-configure
/usr/ports/ftp/curl/files/patch-src-tool_operate.c
>How-To-Repeat:
cd /usr/ports
make update # get latest snapshot from svn repository
cd /usr/ports/ftp/curl
make distclean all
>Fix:
The patches included here have not been tested in any way except that it builds without error.
split the added file into /usr/ports/ftp/curl/files/patch-configure and /usr/ports/ftp/curl/files/patch-src-tool_operate.c
sed -n 2,90p patch_files.txt > /usr/ports/ftp/curl/files/patch-configure
sed -n 97,150p patch_files.txt > /usr/ports/ftp/curl/files/patch-src-tool_operate.c
cd /usr/ports/ftp/curl/ ; make distclean all
Patch attached with submission follows:
# file: /usr/ports/ftp/curl/files/patch-configure
--- configure.orig 2013-10-26 17:23:56.187533339 +0200
+++ configure 2013-10-26 17:34:06.797520049 +0200
@@ -16892,6 +16892,9 @@
tmp_CFLAGS="$CFLAGS"
tmp_CPPFLAGS="$CPPFLAGS"
+# Do not remove the user-supplied debug flags in CFLAGS
+# PR: 150854
+if false; then
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
@@ -16922,6 +16925,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
+fi
#
if test "$want_debug" = "yes"; then
@@ -17139,6 +17143,9 @@
#
if test "$honor_optimize_option" = "yes"; then
+# Do not remove the user-supplied optimization flags in CFLAGS
+# PR: 150854
+if false; then
ac_var_stripped=""
for word1 in $tmp_CFLAGS; do
ac_var_strip_word="no"
@@ -17169,6 +17176,7 @@
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
+fi
if test "$want_optimize" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
@@ -21336,7 +21344,8 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
+ # Use the FreeBSD location of the pkg-config libdir
+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
if test -f "$OPENSSL_PCDIR/openssl.pc"; then
@@ -24685,29 +24694,31 @@
;;
off)
LIB_RTMP="-lrtmp"
+ LD_RTMP=""
+ CPP_RTMP=""
+ DIR_RTMP=""
;;
*)
PREFIX_RTMP=$OPT_LIBRTMP
+ LIB_RTMP="-lrtmp"
+ LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
+ CPP_RTMP=-I${PREFIX_RTMP}/include
+ DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
+
;;
esac
- if test -n "$PREFIX_RTMP"; then
- LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
- CPP_RTMP=-I${PREFIX_RTMP}/include
- DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
- fi
-
LDFLAGS="$LDFLAGS $LD_RTMP"
CPPFLAGS="$CPPFLAGS $CPP_RTMP"
LIBS="$LIB_RTMP $LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
-$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }
-if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
+$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }
+ if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrtmp $LIBS"
+LIBS="$LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
# file /usr/ports/ftp/curl/files/patch-src-tool_operate.c
--- src/tool_operate.c.orig 2013-10-26 17:56:52.107534476 +0200
+++ src/tool_operate.c 2013-10-26 17:58:51.034884243 +0200
@@ -728,28 +728,15 @@
DEBUGASSERT(!outs.filename);
}
- if(config->resume_from_current) {
- /* We're told to continue from where we are now. Get the size
- of the file as it is now and open it for append instead */
- struct_stat fileinfo;
- /* VMS -- Danger, the filesize is only valid for stream files */
- if(0 == stat(outfile, &fileinfo))
- /* set offset to current file size: */
- config->resume_from = fileinfo.st_size;
- else
- /* let offset be 0 */
- config->resume_from = 0;
- }
-
- if(config->resume_from) {
+ if(config->resume_from || config->resume_from_current) {
#ifdef __VMS
/* open file for output, forcing VMS output format into stream
mode which is needed for stat() call above to always work. */
- FILE *file = fopen(outfile, config->resume_from?"ab":"wb",
+ FILE *file = fopen(outfile, "ab",
"ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
#else
/* open file for output: */
- FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
+ FILE *file = fopen(outfile, "ab");
#endif
if(!file) {
helpf(config->errors, "Can't open '%s'!\n", outfile);
@@ -758,6 +745,19 @@
}
outs.fopened = TRUE;
outs.stream = file;
+
+ if(config->resume_from_current) {
+ /* We're told to continue from where we are now. Get the size
+ of the file as it is now */
+ struct_stat fileinfo;
+ if(0 == fstat(fileno(outs.stream), &fileinfo))
+ /* set offset to current file size: */
+ config->resume_from = fileinfo.st_size;
+ else
+ /* let offset be 0 */
+ config->resume_from = 0;
+ }
+
outs.init = config->resume_from;
}
else {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310261638.r9QGcCxo042779>