]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 26 Sep 2016 16:53:49 +0000 (18:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 26 Sep 2016 16:53:49 +0000 (18:53 +0200)
config/rootfiles/packages/krb5
lfs/krb5
lfs/openssl
lfs/samba
src/patches/mitkrb-1.12.1-db2_fix-1.patch [deleted file]

index e1e7d64f16c0aed170d19f71e6e69fa813690a8c..d73f22bbabbfe3fae9948dd8c93a5a34dfcf3066 100644 (file)
@@ -68,6 +68,9 @@ usr/lib/krb5/plugins/libkrb5
 usr/lib/krb5/plugins/preauth
 usr/lib/krb5/plugins/preauth/otp.so
 usr/lib/krb5/plugins/preauth/pkinit.so
+usr/lib/krb5/plugins/preauth/test.so
+usr/lib/krb5/plugins/tls
+usr/lib/krb5/plugins/tls/k5tls.so
 #usr/lib/libgssapi_krb5.so
 usr/lib/libgssapi_krb5.so.2
 usr/lib/libgssapi_krb5.so.2.2
@@ -79,15 +82,15 @@ usr/lib/libk5crypto.so.3
 usr/lib/libk5crypto.so.3.1
 #usr/lib/libkadm5clnt.so
 #usr/lib/libkadm5clnt_mit.so
-usr/lib/libkadm5clnt_mit.so.9
-usr/lib/libkadm5clnt_mit.so.9.0
+usr/lib/libkadm5clnt_mit.so.10
+usr/lib/libkadm5clnt_mit.so.10.0
 #usr/lib/libkadm5srv.so
 #usr/lib/libkadm5srv_mit.so
-usr/lib/libkadm5srv_mit.so.9
-usr/lib/libkadm5srv_mit.so.9.0
+usr/lib/libkadm5srv_mit.so.10
+usr/lib/libkadm5srv_mit.so.10.0
 #usr/lib/libkdb5.so
-usr/lib/libkdb5.so.7
-usr/lib/libkdb5.so.7.0
+usr/lib/libkdb5.so.8
+usr/lib/libkdb5.so.8.0
 #usr/lib/libkrad.so
 usr/lib/libkrad.so.0
 usr/lib/libkrad.so.0.0
@@ -125,8 +128,6 @@ usr/lib/libverto.so.0.0
 #usr/share/examples/krb5/kdc.conf
 #usr/share/examples/krb5/krb5.conf
 #usr/share/examples/krb5/services.append
-#usr/share/gnats
-#usr/share/gnats/mit
 #usr/share/locale/en_US
 #usr/share/locale/en_US/LC_MESSAGES
 #usr/share/locale/en_US/LC_MESSAGES/mit-krb5.mo
@@ -140,7 +141,6 @@ usr/lib/libverto.so.0.0
 #usr/share/man/man1/klist.1
 #usr/share/man/man1/kpasswd.1
 #usr/share/man/man1/krb5-config.1
-#usr/share/man/man1/krb5-send-pr.1
 #usr/share/man/man1/ksu.1
 #usr/share/man/man1/kswitch.1
 #usr/share/man/man1/ktutil.1
@@ -163,3 +163,5 @@ usr/lib/libverto.so.0.0
 #usr/share/man/man8/krb5kdc.8
 #usr/share/man/man8/sserver.8
 var/lib/krb5kdc
+var/lib/run
+var/lib/run/krb5kdc
index 30119823964b31ccd119d85698d08ee63b22bb23..7e346920a052aff87d02c1709c658823977db781 100644 (file)
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.12.1
+VER        = 1.14.4
 
 THISAPP    = krb5-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)/src
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = krb5
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4a631b3474d3e44773f1ecda96f04400
+$(DL_FILE)_MD5 = ba90f5701fc2dda76133c1f34ba4ee80
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/mitkrb-1.12.1-db2_fix-1.patch
 
        cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \
                -e "s@-lpython2.5]@&,\n  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
index d0ed4d30b1aacc64a2f43957d9b84340af89f04f..0405a77f8b314c8d1e009736e911fe144afe012b 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2i
+VER        = 1.0.2j
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb
+$(DL_FILE)_MD5 = 96322138f0b69e61b7212bc53d5e912b
 
 install : $(TARGET)
 
index 369f48633435cb06311871998c8244741bf14f65..74a1b769edd88ec9f087decb563c9c2facb1ac76 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 63
+PAK_VER    = 64
 
 DEPS       = "cups krb5"
 
diff --git a/src/patches/mitkrb-1.12.1-db2_fix-1.patch b/src/patches/mitkrb-1.12.1-db2_fix-1.patch
deleted file mode 100644 (file)
index f27304c..0000000
+++ /dev/null
@@ -1,175 +0,0 @@
-Submitted By:            Pierre Labastie <pierre dot labastie at eamil dot fr>
-Date:                    2014-03-04
-Initial Package Version: 1.12.1
-Upstream Status:         In upstream GIT
-Origin:                  Upstream
-Description:             Fixes http://krbdev.mit.edu/rt/Ticket/Display.html?id=7860
-
---- a/src/plugins/kdb/db2/libdb2/mpool/mpool.c
-+++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
-@@ -81,9 +81,9 @@ mpool_open(key, fd, pagesize, maxcache)
-       /* Allocate and initialize the MPOOL cookie. */
-       if ((mp = (MPOOL *)calloc(1, sizeof(MPOOL))) == NULL)
-               return (NULL);
--      CIRCLEQ_INIT(&mp->lqh);
-+      TAILQ_INIT(&mp->lqh);
-       for (entry = 0; entry < HASHSIZE; ++entry)
--              CIRCLEQ_INIT(&mp->hqh[entry]);
-+              TAILQ_INIT(&mp->hqh[entry]);
-       mp->maxcache = maxcache;
-       mp->npages = sb.st_size / pagesize;
-       mp->pagesize = pagesize;
-@@ -143,8 +143,8 @@ mpool_new(mp, pgnoaddr, flags)
-       bp->flags = MPOOL_PINNED | MPOOL_INUSE;
-       head = &mp->hqh[HASHKEY(bp->pgno)];
--      CIRCLEQ_INSERT_HEAD(head, bp, hq);
--      CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
-+      TAILQ_INSERT_HEAD(head, bp, hq);
-+      TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-       return (bp->page);
- }
-@@ -168,8 +168,8 @@ mpool_delete(mp, page)
-       /* Remove from the hash and lru queues. */
-       head = &mp->hqh[HASHKEY(bp->pgno)];
--      CIRCLEQ_REMOVE(head, bp, hq);
--      CIRCLEQ_REMOVE(&mp->lqh, bp, q);
-+      TAILQ_REMOVE(head, bp, hq);
-+      TAILQ_REMOVE(&mp->lqh, bp, q);
-       free(bp);
-       return (RET_SUCCESS);
-@@ -208,10 +208,10 @@ mpool_get(mp, pgno, flags)
-                * of the lru chain.
-                */
-               head = &mp->hqh[HASHKEY(bp->pgno)];
--              CIRCLEQ_REMOVE(head, bp, hq);
--              CIRCLEQ_INSERT_HEAD(head, bp, hq);
--              CIRCLEQ_REMOVE(&mp->lqh, bp, q);
--              CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
-+              TAILQ_REMOVE(head, bp, hq);
-+              TAILQ_INSERT_HEAD(head, bp, hq);
-+              TAILQ_REMOVE(&mp->lqh, bp, q);
-+              TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-               /* Return a pinned page. */
-               bp->flags |= MPOOL_PINNED;
-@@ -261,8 +261,8 @@ mpool_get(mp, pgno, flags)
-        * of the lru chain.
-        */
-       head = &mp->hqh[HASHKEY(bp->pgno)];
--      CIRCLEQ_INSERT_HEAD(head, bp, hq);
--      CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
-+      TAILQ_INSERT_HEAD(head, bp, hq);
-+      TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-       /* Run through the user's filter. */
-       if (mp->pgin != NULL)
-@@ -311,8 +311,8 @@ mpool_close(mp)
-       BKT *bp;
-       /* Free up any space allocated to the lru pages. */
--      while ((bp = mp->lqh.cqh_first) != (void *)&mp->lqh) {
--              CIRCLEQ_REMOVE(&mp->lqh, mp->lqh.cqh_first, q);
-+      while ((bp = mp->lqh.tqh_first) != NULL) {
-+              TAILQ_REMOVE(&mp->lqh, mp->lqh.tqh_first, q);
-               free(bp);
-       }
-@@ -332,8 +332,7 @@ mpool_sync(mp)
-       BKT *bp;
-       /* Walk the lru chain, flushing any dirty pages to disk. */
--      for (bp = mp->lqh.cqh_first;
--          bp != (void *)&mp->lqh; bp = bp->q.cqe_next)
-+      for (bp = mp->lqh.tqh_first; bp != NULL; bp = bp->q.tqe_next)
-               if (bp->flags & MPOOL_DIRTY &&
-                   mpool_write(mp, bp) == RET_ERROR)
-                       return (RET_ERROR);
-@@ -363,8 +362,7 @@ mpool_bkt(mp)
-        * off any lists.  If we don't find anything we grow the cache anyway.
-        * The cache never shrinks.
-        */
--      for (bp = mp->lqh.cqh_first;
--          bp != (void *)&mp->lqh; bp = bp->q.cqe_next)
-+      for (bp = mp->lqh.tqh_first; bp != NULL; bp = bp->q.tqe_next)
-               if (!(bp->flags & MPOOL_PINNED)) {
-                       /* Flush if dirty. */
-                       if (bp->flags & MPOOL_DIRTY &&
-@@ -375,8 +373,8 @@ mpool_bkt(mp)
- #endif
-                       /* Remove from the hash and lru queues. */
-                       head = &mp->hqh[HASHKEY(bp->pgno)];
--                      CIRCLEQ_REMOVE(head, bp, hq);
--                      CIRCLEQ_REMOVE(&mp->lqh, bp, q);
-+                      TAILQ_REMOVE(head, bp, hq);
-+                      TAILQ_REMOVE(&mp->lqh, bp, q);
- #if defined(DEBUG) && !defined(DEBUG_IDX0SPLIT)
-                       { void *spage;
-                               spage = bp->page;
-@@ -450,7 +448,7 @@ mpool_look(mp, pgno)
-       BKT *bp;
-       head = &mp->hqh[HASHKEY(pgno)];
--      for (bp = head->cqh_first; bp != (void *)head; bp = bp->hq.cqe_next)
-+      for (bp = head->tqh_first; bp != NULL; bp = bp->hq.tqe_next)
-               if ((bp->pgno == pgno) && (bp->flags & MPOOL_INUSE)) {
- #ifdef STATISTICS
-                       ++mp->cachehit;
-@@ -494,8 +492,7 @@ mpool_stat(mp)
-       sep = "";
-       cnt = 0;
--      for (bp = mp->lqh.cqh_first;
--          bp != (void *)&mp->lqh; bp = bp->q.cqe_next) {
-+      for (bp = mp->lqh.tqh_first; bp != NULL; bp = bp->q.tqe_next) {
-               (void)fprintf(stderr, "%s%d", sep, bp->pgno);
-               if (bp->flags & MPOOL_DIRTY)
-                       (void)fprintf(stderr, "d");
-
---- a/src/plugins/kdb/db2/libdb2/mpool/mpool.h
-+++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.h
-@@ -47,8 +47,8 @@
- /* The BKT structures are the elements of the queues. */
- typedef struct _bkt {
--      CIRCLEQ_ENTRY(_bkt) hq;         /* hash queue */
--      CIRCLEQ_ENTRY(_bkt) q;          /* lru queue */
-+      TAILQ_ENTRY(_bkt) hq;           /* hash queue */
-+      TAILQ_ENTRY(_bkt) q;            /* lru queue */
-       void    *page;                  /* page */
-       db_pgno_t   pgno;                       /* page number */
-@@ -59,9 +59,9 @@ typedef struct _bkt {
- } BKT;
- typedef struct MPOOL {
--      CIRCLEQ_HEAD(_lqh, _bkt) lqh;   /* lru queue head */
-+      TAILQ_HEAD(_lqh, _bkt) lqh;     /* lru queue head */
-                                       /* hash queue array */
--      CIRCLEQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
-+      TAILQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
-       db_pgno_t       curcache;               /* current number of cached pages */
-       db_pgno_t       maxcache;               /* max number of cached pages */
-       db_pgno_t       npages;                 /* number of pages in the file */
-
---- a/src/plugins/kdb/db2/libdb2/test/run.test
-+++ b/src/plugins/kdb/db2/libdb2/test/run.test
-@@ -71,10 +71,11 @@ main()
- }
- getnwords() {
--      # Delete blank lines because the db code appears not to
--      # like empty keys.  On Debian Linux, $DICT appears to contain
--      # some non-ASCII characters, and "rev" chokes on them.
--      sed -e '/^$/d' < $DICT | cat -v | sed -e ${1}q
-+      # Delete blank lines because the db code appears not to like
-+      # empty keys.  Omit lines with non-alphanumeric characters to
-+      # avoid shell metacharacters and non-ASCII characters which
-+      # could cause 'rev' to choke.
-+      LC_ALL=C sed -e '/^$/d' -e '/[^A-Za-z]/d' < $DICT | sed -e ${1}q
- }
- # Take the first hundred entries in the dictionary, and make them