pkg/40542: mod-jk is too old in pkgsrc tree

[kab00m%skeleton.phys.spbu.ru@localhost]

>Number:         40542
>Category:       pkg
>Synopsis:       ap_jk and ap2-jk are outdated
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 02 21:15:00 +0000 2009
>Originator:     Dima Veselov
>Release:        NetBSD 5.99.7
>Organization:
LMA
Sincerelly yours
>Environment:
System: NetBSD laura.aero.ru 5.99.7 NetBSD 5.99.7 (XEN3_DOM0) #0: Sat Jan 24 
00:09:05 PST 2009 
builds@wb28:/home/builds/ab/HEAD/amd64/200901240002Z-obj/home/builds/ab/HEAD/src/sys/arch/amd64/compile/XEN3_DOM0
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        I found mod-jk for Apache2 too old in pkgsrc and compiled 1.2.27 on 
x86_64 and Solaris/sparc succesfully
>How-To-Repeat:
>Fix:
        Don't know how to post patches, so posting diff -r -U 3 output


diff -r -U 3 ap-jk.orig/Makefile.common ap-jk/Makefile.common
--- ap-jk.orig/Makefile.common  2009-02-02 23:19:41.000000000 +0300
+++ ap-jk/Makefile.common       2009-02-02 23:11:35.000000000 +0300
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.5 2007/04/25 06:24:02 obache Exp $
 
-JK_VERSION=    1.2.23
+JK_VERSION=    1.2.27
 CATEGORIES=    www java
 MASTER_SITES=  
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-${JK_VERSION}/
 
diff -r -U 3 ap-jk.orig/distinfo ap-jk/distinfo
--- ap-jk.orig/distinfo 2009-02-02 23:19:41.000000000 +0300
+++ ap-jk/distinfo      2009-02-02 23:56:50.000000000 +0300
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.8 2007/04/25 06:24:02 obache Exp $
 
-SHA1 (tomcat-connectors-1.2.23-src.tar.gz) = 
9ab3c108a9e6b20dc7dd172917f8941eee0ec32c
-RMD160 (tomcat-connectors-1.2.23-src.tar.gz) = 
d7892ff73f22e83feb49b4746d769f518e3f4c6a
-Size (tomcat-connectors-1.2.23-src.tar.gz) = 1368060 bytes
-SHA1 (patch-aa) = c7a68265883fd7494356543a17dcec0be7744fe9
-SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08
+SHA1 (tomcat-connectors-1.2.27-src.tar.gz) = 
361f8aaa1844ac76a5dda741152968190b34347b
+RMD160 (tomcat-connectors-1.2.27-src.tar.gz) = 
cb872030d4325ba15d0038c6c7b298213768300a
+Size (tomcat-connectors-1.2.27-src.tar.gz) = 1509182 bytes
+SHA1 (patch-aa) = 2c2548e0c5b5909c7fab369c97f747c4e4c47df2
+SHA1 (patch-ab) = dce384c4e5ec46f8a6752400b7931142ff29c189
 SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a
-SHA1 (patch-ad) = 2c2548e0c5b5909c7fab369c97f747c4e4c47df2
diff -r -U 3 ap-jk.orig/patches/patch-aa ap-jk/patches/patch-aa
--- ap-jk.orig/patches/patch-aa 2009-02-02 23:19:41.000000000 +0300
+++ ap-jk/patches/patch-aa      2009-02-02 23:57:51.000000000 +0300
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2006/01/31 16:26:22 abs Exp $
+$NetBSD: $
 
---- common/jk_util.c.orig      2007-04-10 14:29:48.000000000 +0000
-+++ common/jk_util.c
-@@ -1720,7 +1720,7 @@ int jk_gettid()
-     pthread_getunique_np(&t, &tid);
-     return ((int)(tid.intId.lo & 0xFFFFFFFF));
- #else
--    int tid = (int)(t & 0xFFFF);
-+      int tid = (int)t;
-     return tid;
- #endif /* AS400 */
- }
+--- apache-1.3/Makefile.in.orig        2006-03-02 16:45:37.000000000 +0000
++++ apache-1.3/Makefile.in     2006-03-02 16:45:52.000000000 +0000
+@@ -67,7 +67,7 @@
+ install_dynamic: mod_jk.la
+       @echo ""
+       @echo "Copying files to Apache libexec Directory..."
+-      ${LIBTOOL} --mode=install ${CP} $< ${libexecdir}/mod_jk.so
++      ${APXS} -i mod_jk.so
+ 
+ #
+ # Clean part.
diff -r -U 3 ap-jk.orig/patches/patch-ab ap-jk/patches/patch-ab
--- ap-jk.orig/patches/patch-ab 2009-02-02 23:19:41.000000000 +0300
+++ ap-jk/patches/patch-ab      2009-02-02 23:57:56.000000000 +0300
@@ -1,13 +1,13 @@
 $NetBSD: $
 
---- apache-2.0/Makefile.in.orig        2004-12-24 05:18:10.000000000 -0600
-+++ apache-2.0/Makefile.in     2005-03-29 15:05:10.000000000 -0600
-@@ -20,6 +20,8 @@
+--- apache-2.0/Makefile.in.orig        2009-02-02 23:41:34.000000000 +0300
++++ apache-2.0/Makefile.in     2009-02-02 23:41:46.000000000 +0300
+@@ -36,6 +36,8 @@
  # Apache2 settings, values guessed by Apache config and used to build it
  # Will define libexecdir, LIBTOOL, etc
  include @APACHE_CONFIG_VARS@
 +top_builddir = ..
 +LIBTOOL = 
  
- # Local settings ( overriding/appending to Apache's ) 
+ # Local settings ( overriding/appending to Apache's )
  COMMON=../common
Only in ap-jk.orig/patches: patch-ad