This updates mongrel2 to the latest release. Passes tests on amd64,
maybe it will fix the post-clang build issue on i386, can someone
check?
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mongrel2/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 23 Sep 2016 09:16:58 -0000 1.15
+++ Makefile 6 Aug 2017 17:50:12 -0000
@@ -5,18 +5,18 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = language agnostic asynchronous web server
-V = 1.9.1
+V = 1.11.0
DISTNAME = mongrel2-v${V}
PKGNAME = mongrel2-${V}
-REVISION = 2
CATEGORIES = www
+EXTRACT_SUFX = .tar.bz2
HOMEPAGE = http://mongrel2.org/
# BSD, 3 clause
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES =
https://github.com/zedshaw/mongrel2/releases/download/v${V}/
+MASTER_SITES =
https://github.com/mongrel2/mongrel2/releases/download/v${V}/
# strange charset in filenames; does not use extended headers
TAR = ${LOCALBASE}/bin/gtar
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mongrel2/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 23 Sep 2014 12:09:40 -0000 1.4
+++ distinfo 6 Aug 2017 17:10:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (mongrel2-v1.9.1.tar.gz) = 3EkcmwbxsyAg/Zd3N/oW+Zr22Z57+y+A/MUyeN1E85g=
-SIZE (mongrel2-v1.9.1.tar.gz) = 2175661
+SHA256 (mongrel2-v1.11.0.tar.bz2) =
kX8s4HwJCMrmOsA/MDmBWDk1XUZWhYGQI3e6fkEle+0=
+SIZE (mongrel2-v1.11.0.tar.bz2) = 2513704
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 23 Sep 2014 12:09:40 -0000 1.4
+++ patches/patch-Makefile 6 Aug 2017 17:20:03 -0000
@@ -1,23 +1,24 @@
$OpenBSD: patch-Makefile,v 1.4 2014/09/23 12:09:40 ajacoutot Exp $
---- Makefile.orig Wed Apr 9 18:13:27 2014
-+++ Makefile Mon Sep 22 15:11:10 2014
+Index: Makefile
+--- Makefile.orig
++++ Makefile
@@ -1,5 +1,5 @@
- CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic
-DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+ CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic
-DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
+LIBS=-lzmq -lsqlite3 $(OPTLIBS)
PREFIX?=/usr/local
get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
-@@ -18,7 +18,7 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS
- ifdef $($(shell sh init.sh))
+@@ -29,7 +29,7 @@ ifdef $($(shell
\
+ fi ))
endif
--all: bin/mongrel2 tests m2sh procer
-+all: bin/mongrel2 m2sh procer
+-all: builddirs bin/mongrel2 tests m2sh procer
++all: builddirs bin/mongrel2 m2sh procer
dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
dev: all
-@@ -102,10 +102,9 @@ config_modules: build/libm2.a
+@@ -155,10 +155,9 @@ config_modules: build/libm2.a
${MAKE} ${MAKEOPTS} -C tools/config_modules all
# Try to install first before creating target directory and trying again
Index: patches/patch-src_mem_align_h
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-src_mem_align_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_mem_align_h
--- patches/patch-src_mem_align_h 13 May 2017 08:53:52 -0000 1.1
+++ patches/patch-src_mem_align_h 6 Aug 2017 17:25:07 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_mem_align_h,v 1.1 20
Index: src/mem/align.h
--- src/mem/align.h.orig
+++ src/mem/align.h
-@@ -15,22 +15,13 @@
+@@ -15,22 +15,10 @@
#ifndef _LIBP_ALIGN_H_
#define _LIBP_ALIGN_H_
@@ -22,14 +22,12 @@ Index: src/mem/align.h
- void (*q)(void);
-};
-
--typedef union max_align max_align_t;
-+#ifndef __CLANG_MAX_ALIGN_T_DEFINED
-+#define __CLANG_MAX_ALIGN_T_DEFINED
+-typedef union max_align h_max_align_t;
+-
+typedef struct {
+ long long __max_align_ll __aligned(__alignof__(long long));
+ long double __max_align_ld __aligned(__alignof__(long double));
-+} max_align_t;
-+#endif
-
++} h_max_align_t;
++
#endif
Index: patches/patch-src_polarssl_include_polarssl_dhm_h
===================================================================
RCS file: patches/patch-src_polarssl_include_polarssl_dhm_h
diff -N patches/patch-src_polarssl_include_polarssl_dhm_h
--- patches/patch-src_polarssl_include_polarssl_dhm_h 23 Sep 2014 12:09:40
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_polarssl_include_polarssl_dhm_h,v 1.1 2014/09/23 12:09:40
ajacoutot Exp $
-
-_X is already defined in ctype.h
-
---- src/polarssl/include/polarssl/dhm.h.orig Mon Sep 22 15:13:52 2014
-+++ src/polarssl/include/polarssl/dhm.h Mon Sep 22 15:13:44 2014
-@@ -152,7 +152,7 @@ typedef struct
- mpi RP; /*!< cached R^2 mod P */
- mpi Vi; /*!< blinding value */
- mpi Vf; /*!< un-blinding value */
-- mpi _X; /*!< previous X */
-+ mpi _PX; /*!< previous X */
- }
- dhm_context;
-
Index: patches/patch-src_polarssl_library_dhm_c
===================================================================
RCS file: patches/patch-src_polarssl_library_dhm_c
diff -N patches/patch-src_polarssl_library_dhm_c
--- patches/patch-src_polarssl_library_dhm_c 24 Sep 2014 18:51:15 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_polarssl_library_dhm_c,v 1.1 2014/09/24 18:51:15 ajacoutot
Exp $
-
-_X is already defined in ctype.h
-
---- src/polarssl/library/dhm.c.orig Wed Sep 24 20:47:59 2014
-+++ src/polarssl/library/dhm.c Wed Sep 24 20:48:34 2014
-@@ -276,9 +276,9 @@ static int dhm_update_blinding( dhm_context *ctx,
- * Don't use any blinding the first time a particular X is used,
- * but remember it to use blinding next time.
- */
-- if( mpi_cmp_mpi( &ctx->X, &ctx->_X ) != 0 )
-+ if( mpi_cmp_mpi( &ctx->X, &ctx->_PX ) != 0 )
- {
-- MPI_CHK( mpi_copy( &ctx->_X, &ctx->X ) );
-+ MPI_CHK( mpi_copy( &ctx->_PX, &ctx->X ) );
- MPI_CHK( mpi_lset( &ctx->Vi, 1 ) );
- MPI_CHK( mpi_lset( &ctx->Vf, 1 ) );
-
-@@ -384,7 +384,7 @@ cleanup:
- */
- void dhm_free( dhm_context *ctx )
- {
-- mpi_free( &ctx->_X); mpi_free( &ctx->Vf ); mpi_free( &ctx->Vi );
-+ mpi_free( &ctx->_PX); mpi_free( &ctx->Vf ); mpi_free( &ctx->Vi );
- mpi_free( &ctx->RP ); mpi_free( &ctx->K ); mpi_free( &ctx->GY );
- mpi_free( &ctx->GX ); mpi_free( &ctx->X ); mpi_free( &ctx->G );
- mpi_free( &ctx->P );
Index: patches/patch-src_task_asm_S
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-src_task_asm_S,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_task_asm_S
--- patches/patch-src_task_asm_S 21 Mar 2013 22:23:40 -0000 1.3
+++ patches/patch-src_task_asm_S 6 Aug 2017 17:20:03 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_task_asm_S,v 1.3 201
use movw with (16-bit) segment registers.
---- src/task/asm.S.orig Thu Mar 21 16:21:22 2013
-+++ src/task/asm.S Thu Mar 21 16:21:35 2013
-@@ -45,10 +45,10 @@
+Index: src/task/asm.S
+--- src/task/asm.S.orig
++++ src/task/asm.S
+@@ -39,10 +39,10 @@
SET:
movl 4(%esp), %eax
@@ -19,7 +20,7 @@ use movw with (16-bit) segment registers
movl 20(%eax), %edi
movl 24(%eax), %esi
movl 28(%eax), %ebp
-@@ -65,10 +65,10 @@ SET:
+@@ -59,10 +59,10 @@ SET:
GET:
movl 4(%esp), %eax
Index: patches/patch-tests_darray_tests_c
===================================================================
RCS file: patches/patch-tests_darray_tests_c
diff -N patches/patch-tests_darray_tests_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_darray_tests_c 6 Aug 2017 18:01:20 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Backport test fix from upstream commit
7cb8532e2ecc341d77885764b372a363fbc72eff.
+
+Index: tests/darray_tests.c
+--- tests/darray_tests.c.orig
++++ tests/darray_tests.c
+@@ -82,7 +82,7 @@ char *test_darray_operations()
+ int expectedValues[7] = { 2, 3, 4, 8, 9, 0, 1 };
+
+ for(i = 6; i >= 0; i--) {
+- int *val = darray_pop(array);
++ int *val = darray_pop(array2);
+ mu_assert(val != NULL, "Shouldn't get a NULL.");
+ mu_assert(*val == expectedValues[i], "Wrong value.");
+ darray_free(val);
Index: patches/patch-tests_filters_Makefile
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-tests_filters_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_filters_Makefile
--- patches/patch-tests_filters_Makefile 21 May 2015 05:49:41 -0000
1.1
+++ patches/patch-tests_filters_Makefile 6 Aug 2017 17:20:03 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-tests_filters_Makefile,v 1.1 2015/05/21 05:49:41 ajacoutot Exp
$
---- tests/filters/Makefile.orig Mon May 18 23:02:41 2015
-+++ tests/filters/Makefile Mon May 18 23:02:53 2015
+Index: tests/filters/Makefile
+--- tests/filters/Makefile.orig
++++ tests/filters/Makefile
@@ -1,5 +1,5 @@
PREFIX?=/usr/local
--CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared
-nostartfiles -L../../build
-+CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared
-L../../build
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared
-nostartfiles -L../../build
++CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared
-L../../build
LDFLAGS=$(OPTLIBS)
all: test_filter.so test_filter_a.so test_filter_b.so test_filter_c.so
Index: patches/patch-tools_config_modules_Makefile
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-tools_config_modules_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools_config_modules_Makefile
--- patches/patch-tools_config_modules_Makefile 21 May 2015 05:49:41 -0000
1.1
+++ patches/patch-tools_config_modules_Makefile 6 Aug 2017 17:20:03 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-tools_config_modules_Makefile,v 1.1 2015/05/21 05:49:41
ajacoutot Exp $
---- tools/config_modules/Makefile.orig Mon May 18 23:06:18 2015
-+++ tools/config_modules/Makefile Mon May 18 23:06:25 2015
+Index: tools/config_modules/Makefile
+--- tools/config_modules/Makefile.orig
++++ tools/config_modules/Makefile
@@ -1,5 +1,5 @@
PREFIX?=/usr/local
--CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared
-nostartfiles -L../../build
-+CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared
-L../../build
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared
-nostartfiles -L../../build
++CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared
-L../../build
LDFLAGS=$(OPTLIBS)
MONGO_SRC = mongo-c-driver/src/bson.c \
Index: patches/patch-tools_filters_Makefile
===================================================================
RCS file: /cvs/ports/www/mongrel2/patches/patch-tools_filters_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools_filters_Makefile
--- patches/patch-tools_filters_Makefile 21 May 2015 05:49:41 -0000
1.1
+++ patches/patch-tools_filters_Makefile 6 Aug 2017 17:20:03 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-tools_filters_Makefile,v 1.1 2015/05/21 05:49:41 ajacoutot Exp
$
---- tools/filters/Makefile.orig Mon May 18 23:10:42 2015
-+++ tools/filters/Makefile Mon May 18 23:10:48 2015
+Index: tools/filters/Makefile
+--- tools/filters/Makefile.orig
++++ tools/filters/Makefile
@@ -1,5 +1,5 @@
PREFIX?=/usr/local
--CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared
-nostartfiles -L../../build
-+CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared
-L../../build
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared
-nostartfiles -L../../build
++CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared
-L../../build
LDFLAGS=$(OPTLIBS)
all: null.so rewrite.so sendfile.so
Index: patches/patch-tools_procer_Makefile
===================================================================
RCS file: patches/patch-tools_procer_Makefile
diff -N patches/patch-tools_procer_Makefile
--- patches/patch-tools_procer_Makefile 8 Mar 2013 10:35:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tools_procer_Makefile,v 1.1 2013/03/08 10:35:15 jasper Exp $
---- tools/procer/Makefile.orig Fri Mar 1 09:58:51 2013
-+++ tools/procer/Makefile Fri Mar 1 09:59:00 2013
-@@ -8,7 +8,7 @@ all: procer
-
-
- procer: ../../build/libm2.a ${OBJECTS}
-- gcc $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
-+ ${CC} $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a
${LIBS}
-
- clean:
- rm -f *.o procer
