Merge pull request #1506 from ismell/bug_947

Fixes #947
2026-11-07 10:36:03 -10:00 · 2012-11-26 09:34:40 -08:00 · 2012-11-25 16:28:33 -07:00 · 2012-10-27 15:20:58 +02:00 · 2012-10-27 15:20:45 +02:00 · 2012-10-27 15:20:28 +02:00
102 changed files with 2169 additions and 2605 deletions
@@ -1,55 +0,0 @@
-diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
--- hts-tvheadend-c88a646/src/linuxtv_muxes.h	2011-09-26 20:18:12.000000000 +0200
-+++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h	2011-10-18 13:40:37.768853992 +0200
-@@ -12001,6 +12001,39 @@
- 	{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
- };
- 
-+static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
-+	{ .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
-+	{ .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+	{ .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
-+};
-+
- static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
- 	{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
- 	{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
-@@ -12881,6 +12914,11 @@
- 
- static const struct network networks_DVBC_ch[] = {
- 	{
-+		.name = "GA-Weissenstein",
-+		.muxes = muxes_DVBC_ch_GA_Weissenstein,
-+		.nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
-+	},
-+	{
- 		.name = "Rega-Sense",
- 		.muxes = muxes_DVBC_ch_Rega_Sense,
- 		.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),
@@ -1,14 +0,0 @@
-diff -upr hts-tvheadend-9d775da_orig/src/cwc.c hts-tvheadend-9d775da/src/cwc.c
--- hts-tvheadend-9d775da_orig/src/cwc.c	2011-08-22 22:46:01.000000000 +0200
-+++ hts-tvheadend-9d775da/src/cwc.c	2011-08-22 22:42:29.000000000 +0200
-@@ -1098,7 +1098,9 @@ cwc_thread(void *aux)
- 	continue; // Retry immediately
-       d = 3;
-     } else {
-      d = 60;
-+      if(attempts == 1)
-+        continue; // Retry immediately
-+      d = 3;
-     }
- 
-     ts.tv_sec = time(NULL) + d;
@@ -1,146 +0,0 @@
-From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
-Date: Fri, 30 Sep 2011 12:56:01 +0200
-Subject: [PATCH 1/2] Deliver raw teletext to clients that are able to display
- it (e.g. XBMC)
-
---
- src/parsers.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/tsdemux.c |    7 +++----
- 2 files changed, 58 insertions(+), 4 deletions(-)
-
-diff --git a/src/parsers.c b/src/parsers.c
-index 9b7337d..68c7996 100644
--- a/src/parsers.c
-+++ b/src/parsers.c
-@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data
- static void parse_subtitles(service_t *t, elementary_stream_t *st, 
- 			    const uint8_t *data, int len, int start);
- 
-+static void parse_teletext(service_t *t, elementary_stream_t *st, 
-+			    const uint8_t *data, int len, int start);
-+
- static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len,
- 		     uint32_t next_startcode, int sc_offset);
- 
-@@ -158,6 +161,10 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
-     parse_aac(t, st, data, len, start);
-     break;
- 
-+  case SCT_TELETEXT:
-+    parse_teletext(t, st, data, len, start);
-+    break;
-+
-   default:
-     break;
-   }
-@@ -1232,6 +1239,54 @@ static int parse_pes_header(service_t *t, elementary_stream_t *st,
-   }
- }
- 
-+/**
-+ * Teletext parser
-+ */
-+static void
-+parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data,
-+		int len, int start)
-+{
-+  th_pkt_t *pkt;
-+  int psize, hlen;
-+  const uint8_t *buf;
-+  const uint8_t *d;
-+  if(start) {
-+    st->es_parser_state = 1;
-+    st->es_buf.sb_err = 0;
-+    st->es_parser_ptr = 0;
-+    sbuf_reset(&st->es_buf);    
-+  }
-+
-+  if(st->es_parser_state == 0)
-+    return;
-+
-+  sbuf_append(&st->es_buf, data, len);
-+
-+  if(st->es_buf.sb_ptr < 6)
-+    return;
-+  d = st->es_buf.sb_data;
-+
-+  psize = d[4] << 8 | d[5];
-+
-+  if(st->es_buf.sb_ptr != psize + 6)
-+    return;
-+
-+  st->es_parser_state = 0;
-+
-+  hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6);
-+  if(hlen < 0)
-+    return;
-+
-+  psize -= hlen;
-+  buf = d + 6 + hlen;
-+  
-+  if(psize >= 46) {
-+
-+      pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts);
-+      pkt->pkt_commercial = t->s_tt_commercial_advice;
-+      parser_deliver(t, st, pkt);
-+  }	
-+}
- 
- /**
-  *
-diff --git a/src/tsdemux.c b/src/tsdemux.c
-index 897fe1d..5fdaf8b 100644
--- a/src/tsdemux.c
-+++ b/src/tsdemux.c
-@@ -110,11 +110,10 @@
- 			   got_section, st);
-     break;
- 
-  case SCT_TELETEXT:
-    teletext_input(t, st, tsb);
-    break;
-
-   default:
-+    if(st->es_type == SCT_TELETEXT)
-+      teletext_input(t, st, tsb);
-+
-     if(off > 188)
-       break;
- 
-- 
-1.7.5.4
-
-
-From a8026cd5b412c5096b0904f060ad5ffccdb883cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
-Date: Thu, 17 Nov 2011 08:25:31 +0100
-Subject: [PATCH 2/2] Disable teletext recording to prevent issues with other
- elementary streams. Temporary until a better solution
- is found.
-
---
- src/plumbing/globalheaders.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
-index 703591b..7f183d4 100644
--- a/src/plumbing/globalheaders.c
-+++ b/src/plumbing/globalheaders.c
-@@ -202,6 +202,12 @@
- 						  pkt->pkt_componentindex);
-     assert(ssc != NULL);
- 
-+    if(ssc->ssc_type == SCT_TELETEXT) {
-+      free(sm);
-+      ssc->ssc_disabled = 1;
-+      break;
-+    }
-+
-     pkt = convertpkt(ssc, pkt);
- 
-     apply_header(ssc, pkt);
-- 
-1.7.5.4
-
-
@@ -1,257 +0,0 @@
-From bb048589ab4e09e69b2fba3f639e8287ea9cc7c3 Mon Sep 17 00:00:00 2001
-From: Tadej Novak <[email protected]>
-Date: Thu, 26 Jan 2012 18:39:09 +0100
-Subject: [PATCH 1/2] IPTV Radio support
-
-Added service type for IPTV and IPTV radio for easier access in
-some software (like XBMC).
---
- src/iptv_input.c             |    6 ++++++
- src/service.c                |    9 +++++++--
- src/service.h                |    2 ++
- src/webui/extjs.c            |   10 +++++++++-
- src/webui/static/app/iptv.js |   11 +++++++++--
- 5 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/src/iptv_input.c b/src/iptv_input.c
-index 0bfc311..361a151 100644
--- a/src/iptv_input.c
-+++ b/src/iptv_input.c
-@@ -428,6 +428,7 @@
-     inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6));
-     htsmsg_add_str(m, "group", abuf6);
-   }
-+  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO);
-   if(t->s_ch != NULL) {
-     htsmsg_add_str(m, "channelname", t->s_ch->ch_name);
-     htsmsg_add_u32(m, "mapped", 1);
-@@ -591,6 +592,11 @@
-     if(!htsmsg_get_u32(c, "port", &u32))
-       t->s_iptv_port = u32;
- 
-+    if(!htsmsg_get_u32(c, "radio", &u32) && u32)
-+      t->s_servicetype = ST_IPTV_RADIO;
-+    else
-+      t->s_servicetype = ST_IPTV;
-+
-     pthread_mutex_lock(&t->s_stream_mutex);
-     service_make_nicename(t);
-     psi_load_service_settings(c, t);
-diff --git a/src/service.c b/src/service.c
-index 1a405d1..6899e2e 100644
--- a/src/service.c
-+++ b/src/service.c
-@@ -732,6 +732,8 @@
-   { "HDTV",         ST_HDTV },
-   { "SDTV-AC",      ST_AC_SDTV },
-   { "HDTV-AC",      ST_AC_HDTV },
-+  { "IPTV",         ST_IPTV },
-+  { "IPTV Radio",   ST_IPTV_RADIO },
- };
- 
- const char *
-@@ -750,7 +752,8 @@
-     t->s_servicetype == ST_SDTV    ||
-     t->s_servicetype == ST_HDTV    ||
-     t->s_servicetype == ST_AC_SDTV ||
-    t->s_servicetype == ST_AC_HDTV;
-+    t->s_servicetype == ST_AC_HDTV ||
-+    t->s_servicetype == ST_IPTV;
- }
- 
- /**
-@@ -759,7 +762,9 @@
- int
- service_is_radio(service_t *t)
- {
-  return t->s_servicetype == ST_RADIO;
-+  return
-+    t->s_servicetype == ST_RADIO ||
-+    t->s_servicetype == ST_IPTV_RADIO;
- }
- 
- /**
-diff --git a/src/service.h b/src/service.h
-index 2185e42..186278d 100644
--- a/src/service.h
-+++ b/src/service.h
-@@ -318,6 +318,8 @@ typedef void (pid_section_callback_t)(struct service *t,
-     ST_HDTV       = 0x11,   /* HDTV (MPEG2) */
-     ST_AC_SDTV    = 0x16,   /* Advanced codec SDTV */
-     ST_AC_HDTV    = 0x19,   /* Advanced codec HDTV */
-+    ST_IPTV       = 0x30,   /* IPTV */
-+    ST_IPTV_RADIO = 0x31,   /* Radio over IPTV */
-   } s_servicetype;
- 
- 
-diff --git a/src/webui/extjs.c b/src/webui/extjs.c
-index 3ed9f8b..4596005 100644
--- a/src/webui/extjs.c
-+++ b/src/webui/extjs.c
-@@ -1313,7 +1313,14 @@
-       }
-       save = 1;
-     }
-    
-+    if(!htsmsg_get_u32(c, "radio", &u32)) {
-+        if(u32)
-+          t->s_servicetype = ST_IPTV_RADIO;
-+        else
-+          t->s_servicetype = ST_IPTV;
-+      save = 1;
-+    }
-+
- 
-     save |= tvh_str_update(&t->s_iptv_iface, htsmsg_get_str(c, "interface"));
-     if(save)
-@@ -1347,6 +1354,7 @@
-   }
- 
-   htsmsg_add_u32(r, "port", t->s_iptv_port);
-+  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO);
-   htsmsg_add_u32(r, "enabled", t->s_enabled);
-   return r;
- }
-diff --git a/src/webui/static/app/iptv.js b/src/webui/static/app/iptv.js
-index acdbfc0..b29e0b9 100644
--- a/src/webui/static/app/iptv.js
-+++ b/src/webui/static/app/iptv.js
-@@ -11,6 +11,12 @@ tvheadend.iptv = function(adapterId) {
-        width: 45
-     });
- 
-+    var radioColumn = new Ext.grid.CheckColumn({
-+       header: "Radio",
-+       dataIndex: 'radio',
-+       width: 45
-+    });
-+
-     var actions = new Ext.ux.grid.RowActions({
- 	header:'',
- 	dataIndex: 'actions',
-@@ -82,6 +88,7 @@ tvheadend.iptv = function(adapterId) {
- 		maxValue: 65535
- 	    })
- 	},
-+	radioColumn,
- 	{
- 	    header: "Service ID",
- 	    dataIndex: 'sid',
-@@ -105,7 +112,7 @@ tvheadend.iptv = function(adapterId) {
-     cm.defaultSortable = true;
- 
-     var rec = Ext.data.Record.create([
-	'id', 'enabled', 'channelname', 'interface', 'group', 'port',
-+    'id', 'enabled', 'channelname', 'interface', 'group', 'port', 'radio',
- 	'sid', 'pmt', 'pcr'
-     ]);
- 
-@@ -246,7 +253,7 @@ tvheadend.iptv = function(adapterId) {
- 	stripeRows: true,
- 	title: 'IPTV',
- 	iconCls: 'iptv',
-	plugins: [enabledColumn, actions],
-+	plugins: [enabledColumn, radioColumn, actions],
- 	store: store,
- 	clicksToEdit: 2,
- 	cm: cm,
-- 
-1.7.5.4
-
-
-From 18473dd11d983aecb6db6e49b454a5d6bb1a329f Mon Sep 17 00:00:00 2001
-From: Tadej Novak <[email protected]>
-Date: Mon, 30 Jan 2012 16:55:25 +0100
-Subject: [PATCH 2/2] Use the same service type for all radio types
-
-Tvheadend now uses same radio type ST_RADIO for DVB and IPTV radios.
-Otherwise IPTV streams have ST_IPTV type.
---
- src/iptv_input.c  |    4 ++--
- src/service.c     |    5 +----
- src/service.h     |    1 -
- src/webui/extjs.c |    4 ++--
- 4 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/iptv_input.c b/src/iptv_input.c
-index 361a151..aeb0ab2 100644
--- a/src/iptv_input.c
-+++ b/src/iptv_input.c
-@@ -428,7 +428,7 @@
-     inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6));
-     htsmsg_add_str(m, "group", abuf6);
-   }
-  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_IPTV_RADIO);
-+  htsmsg_add_u32(m, "radio", t->s_servicetype == ST_RADIO);
-   if(t->s_ch != NULL) {
-     htsmsg_add_str(m, "channelname", t->s_ch->ch_name);
-     htsmsg_add_u32(m, "mapped", 1);
-@@ -593,7 +593,7 @@
-       t->s_iptv_port = u32;
- 
-     if(!htsmsg_get_u32(c, "radio", &u32) && u32)
-      t->s_servicetype = ST_IPTV_RADIO;
-+      t->s_servicetype = ST_RADIO;
-     else
-       t->s_servicetype = ST_IPTV;
- 
-diff --git a/src/service.c b/src/service.c
-index 6899e2e..015cd46 100644
--- a/src/service.c
-+++ b/src/service.c
-@@ -733,7 +733,6 @@
-   { "SDTV-AC",      ST_AC_SDTV },
-   { "HDTV-AC",      ST_AC_HDTV },
-   { "IPTV",         ST_IPTV },
-  { "IPTV Radio",   ST_IPTV_RADIO },
- };
- 
- const char *
-@@ -762,9 +761,7 @@
- int
- service_is_radio(service_t *t)
- {
-  return
-    t->s_servicetype == ST_RADIO ||
-    t->s_servicetype == ST_IPTV_RADIO;
-+  return t->s_servicetype == ST_RADIO;
- }
- 
- /**
-diff --git a/src/service.h b/src/service.h
-index 186278d..40d1174 100644
--- a/src/service.h
-+++ b/src/service.h
-@@ -319,7 +319,6 @@ typedef void (pid_section_callback_t)(struct service *t,
-     ST_AC_SDTV    = 0x16,   /* Advanced codec SDTV */
-     ST_AC_HDTV    = 0x19,   /* Advanced codec HDTV */
-     ST_IPTV       = 0x30,   /* IPTV */
-    ST_IPTV_RADIO = 0x31,   /* Radio over IPTV */
-   } s_servicetype;
- 
- 
-diff --git a/src/webui/extjs.c b/src/webui/extjs.c
-index 4596005..4487deb 100644
--- a/src/webui/extjs.c
-+++ b/src/webui/extjs.c
-@@ -1315,7 +1315,7 @@
-     }
-     if(!htsmsg_get_u32(c, "radio", &u32)) {
-         if(u32)
-          t->s_servicetype = ST_IPTV_RADIO;
-+          t->s_servicetype = ST_RADIO;
-         else
-           t->s_servicetype = ST_IPTV;
-       save = 1;
-@@ -1354,7 +1354,7 @@
-   }
- 
-   htsmsg_add_u32(r, "port", t->s_iptv_port);
-  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_IPTV_RADIO);
-+  htsmsg_add_u32(r, "radio", t->s_servicetype == ST_RADIO);
-   htsmsg_add_u32(r, "enabled", t->s_enabled);
-   return r;
- }
-- 
-1.7.5.4
-
@@ -1,18 +0,0 @@
-Author: Adam Sutton <[email protected]>
-Date:   Sun Jul 29 20:37:00 2012 +0100
-
-    Fix false trigger of uninit var, detected using gcc v4.7.1 (compiling openelec tvh add-on), reported by seo.
-
-diff --git a/src/htsp.c b/src/htsp.c
-index b9fc3e1..ae5bd51 100644
--- a/src/htsp.c
-+++ b/src/htsp.c
-@@ -1160,7 +1160,7 @@ htsp_read_message(htsp_connection_t *htsp, htsmsg_t **mp, int timeout)
- static int
- htsp_read_loop(htsp_connection_t *htsp)
- {
-  htsmsg_t *m, *reply;
-+  htsmsg_t *m = NULL, *reply;
-   int r, i;
-   const char *method;
-
@@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
  cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend
+  cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
@@ -34,7 +34,6 @@ cd $PKG_BUILD
            --arch=$TARGET_ARCH \
            --cpu=$TARGET_CPU \
            --cc=$TARGET_CC \
-            --release
+            --enable-bundle

 make
-make build.linux/tvheadend.bundle
@@ -1,3 +1,8 @@
+2.1.6 (unreleased)
+- add support to install as system addon
+- update to TVHeadend 3.2, rename addon
+- add version string to addon summary
+
 2.1.5
 - add an option to wait for more than 1 adapters to appear

@@ -1,7 +1,7 @@
 {
 	"grabbers": [
 		{
-			"path": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file",
+			"path": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file",
 			"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
 			"version": "0.1\n",
 			"mtime": 1318774706,
@@ -10,5 +10,5 @@
 	],
 	"grab-interval": 12,
 	"grab-enabled": 1,
-	"current-grabber": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file"
+	"current-grabber": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file"
 }
@@ -18,20 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-PKG_NAME="hts-tvheadend"
-PKG_VERSION="78213a0"
-PKG_REV="5"
+PKG_NAME="tvheadend"
+PKG_VERSION="3.2"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-# PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+#PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="$ICONV avahi openssl"
 PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
-PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
-PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
+PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
+PKG_LONGDESC="Tvheadend (Version: $PKG_VERSION) is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
@@ -22,7 +22,7 @@

 . /etc/profile

-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
@@ -25,8 +25,9 @@
 LOCKDIR="/var/lock/"
 LOCKFILE="tvheadend.disabled"

-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
+ADDON_SYS_DIR="/usr/lib/xbmc/addons/service.multimedia.tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_BIN="tvheadend"
 LOG_FILE="$ADDON_HOME/service.log"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
@@ -37,26 +38,58 @@ DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
 DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
 DVR_DIR="$HOME/recordings"

+## handle upgrade. this should be removed later
+
+# remove any old hts-tvheadend dir
+if [ -d $HOME/.xbmc/addons/service.multimedia.hts-tvheadend ] ; then
+  # stop old service if runing
+  $HOME/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tvheadend.stop
+  rm -rf $HOME/.xbmc/addons/service.multimedia.hts-tvheadend
+fi
+
+# reuse old config files
+if [ -d $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend ] ; then
+  mv $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend $ADDON_HOME
+  sed -i 's/service.multimedia.hts-tvheadend/service.multimedia.tvheadend/g' $ADDON_HOME/xmltv/config
+fi
+##
+
 if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  if [ -f $ADDON_DIR/settings-default.xml ]; then
+    cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cp $ADDON_SYS_DIR/settings-default.xml $ADDON_SETTINGS
+  fi
 fi

 if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
  mkdir -p $XMLTV_SETTINGS_DIR
-  cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  if [ -f $ADDON_DIR/xmltv-config ]; then
+    cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/xmltv-config ]; then
+    cp $ADDON_SYS_DIR/xmltv-config $XMLTV_SETTINGS_FILE
+  fi
 fi

 if [ ! -f "$DVR_SETTINGS_FILE" ]; then
  mkdir -p $DVR_DIR
  mkdir -p $DVR_SETTINGS_DIR
-  cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  if [ -f $ADDON_DIR/dvr-config ]; then
+    cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
+  elif [ -f $ADDON_SYS_DIR/dvr-config ]; then
+    cp $ADDON_SYS_DIR/dvr-config $DVR_SETTINGS_FILE
+  fi
 fi

 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"

 mkdir -p /var/config
-cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
+  if [ -f $ADDON_DIR/settings-default.xml ]; then
+    cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
+  elif [ -f $ADDON_SYS_DIR/settings-default.xml ]; then
+    cat "$ADDON_SYS_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
+  fi
+  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf

 . /var/config/tvheadend.conf.default
 . /var/config/tvheadend.conf
@@ -20,10 +20,10 @@

 import xbmc, xbmcaddon, time, os, subprocess

-__scriptname__ = "HTS TVheadend Service"
+__scriptname__ = "TVHeadend Service"
 __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
-__settings__   = xbmcaddon.Addon(id='service.multimedia.hts-tvheadend')
+__settings__   = xbmcaddon.Addon(id='service.multimedia.tvheadend')
 __cwd__        = __settings__.getAddonInfo('path')
 __start__      = xbmc.translatePath( os.path.join( __cwd__, 'bin', "tvheadend.start") )
 __stop__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "tvheadend.stop") )
@@ -22,7 +22,7 @@

 . /etc/profile

-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`

@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="mysql"
-PKG_VERSION="5.1.65"
+PKG_VERSION="5.1.66"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3071400"
+PKG_VERSION="autoconf-3071401"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
@@ -19,12 +19,12 @@
 ################################################################################

 PKG_NAME="glib"
-PKG_VERSION="2.32.4"
+PKG_VERSION="2.34.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.32/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib $ICONV libffi pcre"
 PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host gtk-doc Python-host"
 PKG_PRIORITY="optional"
@@ -1,20 +0,0 @@
-diff -Naur glib-2.32.3/configure.ac glib-2.32.3.patch/configure.ac
--- glib-2.32.3/configure.ac	2012-05-15 00:05:58.000000000 +0200
-+++ glib-2.32.3.patch/configure.ac	2012-06-01 03:41:27.253189379 +0200
-@@ -457,14 +457,14 @@
- dnl zlib support
- dnl
- PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
-if test "x$found_zlib" = "xno" ; then
-+AS_IF([test "x$found_zlib" = "xno"], [
-   AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
-   if test "x$found_zlib" = "xno" ; then
-     AC_MSG_ERROR([*** Working zlib library and headers not found ***])
-   fi
-   ZLIB_LIBS='-lz'
-   AC_SUBST(ZLIB_LIBS)
-fi
-+])
- 
- PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
- AC_SUBST(LIBFFI_CFLAGS)
@@ -1,808 +0,0 @@
-diff -Naur glib-2.32.3/configure.ac glib-2.32.3.patch/configure.ac
--- glib-2.32.3/configure.ac	2012-06-01 03:42:10.016773547 +0200
-+++ glib-2.32.3.patch/configure.ac	2012-06-01 03:45:09.568226313 +0200
-@@ -193,7 +193,7 @@
- AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
- AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
- 
-if test "$glib_native_win32" = "yes"; then
-+AS_IF([test "$glib_native_win32" = "yes"], [
-   AC_CHECK_TOOL(WINDRES, windres, no)
-   if test "$WINDRES" = no; then
-     AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
-@@ -204,7 +204,7 @@
-   fi
-   AC_CHECK_TOOL(RANLIB, ranlib, :)
-   AC_CHECK_PROG(ms_librarian, [lib.exe], [yes], [no])
-fi
-+])
- AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
- 
- if test "$glib_native_win32" != yes; then
-@@ -217,10 +217,10 @@
- fi
- AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
- 
-if test "x$glib_have_carbon" = "xyes"; then
-+AS_IF([test "x$glib_have_carbon" = "xyes"], [
-   AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
-   LDFLAGS="$LDFLAGS -framework Carbon"
-fi
-+])
- 
- if test "x$glib_have_cocoa" = "xyes"; then
-   AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
-@@ -228,9 +228,9 @@
- fi
- 
- gl_GLIBC21
-if test "x$GLIBC21" = "xyes"; then
-+AS_IF([test "x$GLIBC21" = "xyes"], [
-   AC_DEFINE([_GNU_SOURCE], 1, [Make all glibc extensions visible])
-fi
-+])
- 
- dnl declare --enable-* args and collect ac_help strings
- AC_ARG_ENABLE(debug,
-@@ -252,20 +252,18 @@
-               [enable_rebuilds=yes])
- 
- AC_MSG_CHECKING([whether to enable garbage collector friendliness])
-if test "x$enable_gc_friendly" = "xyes"; then
-+AS_IF([test "x$enable_gc_friendly" = "xyes"], [
-   AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
-   AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-+], [ AC_MSG_RESULT([no]) ])
- 
- AC_MSG_CHECKING([whether to disable memory pools])
-if test "x$disable_mem_pools" = "xno"; then
-+AS_IF([test "x$disable_mem_pools" = "xno"], [
-   AC_MSG_RESULT([no])
-else
-+], [
-   AC_DEFINE(DISABLE_MEM_POOLS, [1], [Whether to disable memory pools])
-   AC_MSG_RESULT([yes])
-fi
-+])
- 
- dnl location to install runtime libraries, e.g. ../../lib to install
- dnl to /lib if libdir is /usr/lib
-@@ -388,9 +386,9 @@
- 
- dnl On Windows we use a native implementation
- 
-if test x"$glib_native_win32" = xyes; then
-+AS_IF([ test x"$glib_native_win32" = xyes], [
-   with_libiconv=native
-else
-+], [
-   AC_ARG_WITH(libiconv,
- 	      [AC_HELP_STRING([--with-libiconv=@<:@no/gnu/native@:>@],
- 			      [use the libiconv library])],,
-@@ -424,7 +422,7 @@
-   if test "x$found_iconv" = "xno" ; then
-      AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
-   fi
-fi
-+])
- 
- AC_ARG_ENABLE(iconv-cache, 
-               [AC_HELP_STRING([--enable-iconv-cache=@<:@yes/no/auto@:>@],
-@@ -498,14 +496,14 @@
- dnl Now we are done with gettext checks, figure out ICONV_LIBS
- dnl
- 
-if test x"$glib_native_win32" != xyes; then
-+AS_IF([test x"$glib_native_win32" != xyes], [
-   if test x$with_libiconv != xno ; then
-     case " $INTLLIBS " in
-     *[[\ \	]]-liconv[[\ \	]]*) ;;
-     *) ICONV_LIBS="-liconv" ;;
-     esac
-   fi
-fi
-+])
- AC_SUBST(ICONV_LIBS)
- 
- case $with_libiconv in
-@@ -531,7 +529,7 @@
-   esac
- fi
- 
-if test "$glib_native_win32" = "yes"; then
-+AS_IF([test "$glib_native_win32" = "yes"], [
-   if test x$enable_static = xyes -a x$enable_shared = xyes; then
-     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
-   fi
-@@ -541,13 +539,13 @@
- #define GOBJECT_STATIC_COMPILATION 1"
-     AC_SUBST(GLIB_WIN32_STATIC_COMPILATION_DEFINE)
-   fi
-fi
-+])
- AM_CONDITIONAL(OS_WIN32_AND_DLL_COMPILATION, [test x$glib_native_win32 = xyes -a x$glib_win32_static_compilation != xyes])
- 
- dnl
- dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
- dnl
-if test $cross_compiling != yes ; then
-+AS_IF([test $cross_compiling != yes], [
-     AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
-     glib_save_LIBS=$LIBS
-     LIBS="$LIBS -lm"
-@@ -566,7 +564,7 @@
- 	 )
-     )
-     LIBS=$glib_save_LIBS
-fi
-+])
- 
- dnl NeXTStep cc seems to need this
- AC_MSG_CHECKING([for extra flags for POSIX compliance])
-@@ -615,7 +613,7 @@
- ])
- fi
- 
-if test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8; then
-+AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], [
- 	# long long is a 64 bit integer.
- 	AC_MSG_CHECKING(for format to printf and scanf a guint64)
- 	AC_CACHE_VAL(glib_cv_long_long_format,[
-@@ -634,16 +632,14 @@
- 			break],
- 			[],[:])
- 		done])
-	if test -n "$glib_cv_long_long_format"; then
-+	AS_IF([ test -n "$glib_cv_long_long_format"], [
- 	  AC_MSG_RESULT(%${glib_cv_long_long_format}u)
- 	  AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
- 	  if test x"$glib_cv_long_long_format" = xI64; then
- 	    AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
-	  fi
-        else
-	  AC_MSG_RESULT(none)
-        fi
-elif test x$ac_cv_sizeof___int64 = x8; then
-+          fi
-+	], [AC_MSG_RESULT(none)])
-+],[ test x$ac_cv_sizeof___int64 = x8], [
- 	# __int64 is a 64 bit integer.
- 	AC_MSG_CHECKING(for format to printf and scanf a guint64)
- 	# We know this is MSVCRT.DLL, and what the formats are
-@@ -651,7 +647,7 @@
- 	AC_MSG_RESULT(%${glib_cv_long_long_format}u)
-         AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
- 	AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
-fi
-+])
- 
- AC_C_CONST
- 
-@@ -663,7 +659,7 @@
- SANE_MALLOC_PROTOS=no
- AC_MSG_CHECKING([if malloc() and friends prototypes are gmem.h compatible])
- glib_save_CFLAGS=$CFLAGS
-if test "x$GCC" = "xyes"; then
-+AS_IF([test "x$GCC" = "xyes"], [
-   CFLAGS="$CFLAGS -Werror"
-   AC_TRY_COMPILE([#include <stdlib.h>], [
-     void* (*my_calloc_p)  (size_t, size_t) = calloc;
-@@ -678,7 +674,7 @@
-     AC_DEFINE(SANE_MALLOC_PROTOS, 1, 
-       [Define if you have correct malloc prototypes])
-     SANE_MALLOC_PROTOS=yes)
-fi
-+])
- AC_MSG_RESULT($SANE_MALLOC_PROTOS)
- CFLAGS=$glib_save_CFLAGS
- 
-@@ -795,7 +791,7 @@
- AC_MSG_RESULT($g_have_iso_c_varargs)
- 
- AC_MSG_CHECKING(for ISO C99 varargs macros in C++)
-if test "$CXX" = ""; then
-+AS_IF([test "$CXX" = ""], [
- dnl No C++ compiler
-   g_have_iso_cxx_varargs=no
- else
-@@ -806,7 +802,7 @@
- call_a(2,3);
- ],g_have_iso_cxx_varargs=yes,g_have_iso_cxx_varargs=no)
-   AC_LANG_C
-fi
-+])
- AC_MSG_RESULT($g_have_iso_cxx_varargs)
- 
- AC_MSG_CHECKING(for GNUC varargs macros)
-@@ -952,8 +948,8 @@
- dnl warnings when used in the location as size_t. (This matters
- dnl on AIX with xlc)
- dnl
-if test $ac_cv_sizeof_size_t = $ac_cv_sizeof_int &&
-   test $ac_cv_sizeof_size_t = $ac_cv_sizeof_long ; then
-+AS_IF([test $ac_cv_sizeof_size_t = $ac_cv_sizeof_int &&
-+       test $ac_cv_sizeof_size_t = $ac_cv_sizeof_long], [
-   GLIB_CHECK_COMPILE_WARNINGS([AC_LANG_SOURCE([[
- #if defined(_AIX) && !defined(__GNUC__)
- #pragma options langlvl=stdc89
-@@ -978,7 +974,7 @@
-    return (int)*size_long;
- }
-         ]])],glib_size_type=long)])
-fi
-+])
- 
- AC_MSG_RESULT(unsigned $glib_size_type)
- 
-@@ -1058,7 +1054,7 @@
- AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex)
- AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h])
- 
-if test $glib_native_win32 = no; then
-+AS_IF([test $glib_native_win32 = no], [
-   # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150
-   NETWORK_LIBS=""
-   AC_MSG_CHECKING([for res_query])
-@@ -1089,7 +1085,7 @@
-   AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket,
- 				        [NETWORK_LIBS="-lsocket $NETWORK_LIBS"],
- 				        [AC_MSG_ERROR(Could not find socket())]))
-fi
-+])
- AC_SUBST(NETWORK_LIBS)
- 
- AC_CHECK_HEADER([linux/netlink.h],
-@@ -1112,7 +1108,7 @@
- dnl
- dnl if statfs() takes 2 arguments (Posix) or 4 (Solaris)
- dnl
-if test "$ac_cv_func_statfs" = yes ; then
-+AS_IF([test "$ac_cv_func_statfs" = yes], [
-   AC_MSG_CHECKING([number of arguments to statfs()])
-   AC_TRY_COMPILE([#include <unistd.h>
-   #ifdef HAVE_SYS_PARAM_H
-@@ -1148,7 +1144,7 @@
-       AC_DEFINE(STATFS_ARGS, 4, [Number of arguments to statfs()])],[
-       AC_MSG_RESULT(unknown)
-       AC_MSG_ERROR([unable to determine number of arguments to statfs()])])])
-fi
-+])
- 
- #
- # Check whether to use an included printf
-@@ -1184,14 +1180,14 @@
- enable_included_printf=$need_included_printf
- 
- AM_CONDITIONAL(HAVE_GOOD_PRINTF, test "$enable_included_printf" != "yes")
-if test "$enable_included_printf" != "yes" ; then 
-+AS_IF([test "$enable_included_printf" != "yes"], [
-   AC_DEFINE(HAVE_GOOD_PRINTF,1,[define to use system printf])
-else
-+], [
-   if test -z "$glib_cv_long_long_format" ; then
-     glib_cv_long_long_format="ll"
-   fi
-   AC_DEFINE(HAVE_VASPRINTF,1)
-fi
-+])
- 
- # Checks needed for gnulib vasnprintf
- bh_C_SIGNED
-@@ -1207,7 +1203,7 @@
- 
- # Check if bcopy can be used for overlapping copies, if memmove isn't found.
- # The check is borrowed from the PERL Configure script.
-if test "$ac_cv_func_memmove" != "yes"; then
-+AS_IF([test "$ac_cv_func_memmove" != "yes"],
-   AC_CACHE_CHECK(whether bcopy can handle overlapping copies,
-     glib_cv_working_bcopy,[AC_TRY_RUN([
-       int main() {
-@@ -1230,15 +1226,15 @@
-   if test "$glib_cv_working_bcopy" = "yes"; then
-     AC_DEFINE(HAVE_WORKING_BCOPY,1,[Have a working bcopy])
-   fi
-fi
-+])
- 
- # Check if <sys/select.h> needs to be included for fd_set
- AC_MSG_CHECKING([for fd_set])
- AC_TRY_COMPILE([#include <sys/types.h>],
-         [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
-if test "$gtk_ok" = "yes"; then
-+AS_IF([test "$gtk_ok" = "yes"], [
-     AC_MSG_RESULT([yes, found in sys/types.h])
-else
-+], [
-     AC_EGREP_HEADER(fd_set, sys/select.h, gtk_ok=yes)
-     if test "$gtk_ok" = "yes"; then
- 	# *** FIXME: give it a different name
-@@ -1248,7 +1244,7 @@
- 	AC_DEFINE(NO_FD_SET,1,[didn't find fd_set])
- 	AC_MSG_RESULT(no)
-     fi
-fi
-+])
- 
- dnl *** check for sane realloc() ***
- AC_CACHE_CHECK([whether realloc (NULL,) will work],glib_cv_sane_realloc,[
-@@ -1260,9 +1256,9 @@
-         [glib_cv_sane_realloc=no],
- 	[glib_cv_sane_realloc=yes])
- ])
-if test x$glib_cv_sane_realloc = xyes; then
-+AS_IF([test x$glib_cv_sane_realloc = xyes], [
-   AC_DEFINE(REALLOC_0_WORKS,1,[whether realloc (NULL,) works])
-fi
-+])
- 
- dnl Check for nl_langinfo and CODESET
- AC_CACHE_CHECK([for nl_langinfo (CODESET)],glib_cv_langinfo_codeset,[
-@@ -1348,12 +1344,12 @@
-       :
-     fi
-     ])
-if test "$glib_cv_compliant_posix_memalign" = "1"; then
-+AS_IF([test "$glib_cv_compliant_posix_memalign" = "1"], [
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS, 1, [define if posix_memalign() can allocate any size])
-else
-+], [
-     AC_MSG_RESULT(no)
-fi
-+])
- 
- 
- dnl ****************************************
-@@ -1450,9 +1446,9 @@
- 	[glib_cv_va_val_copy=yes])
- ])
- 
-if test "x$glib_cv_va_val_copy" = "xno"; then
-+AS_IF([ test "x$glib_cv_va_val_copy" = "xno"], [
-   AC_DEFINE(G_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
-fi
-+])
- 
- dnl ***********************
- dnl *** g_module checks ***
-@@ -1485,45 +1481,45 @@
-   esac
- fi
- dnl *** dlopen() and dlsym() in system libraries
-if test -z "$G_MODULE_IMPL"; then
-+AS_IF([ test -z "$G_MODULE_IMPL"], [
- 	AC_CHECK_FUNC(dlopen,
- 		      [AC_CHECK_FUNC(dlsym,
- 			             [G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
- 		      [])
-fi
-+])
- dnl *** load_image (BeOS)
-if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then
-+AS_IF([test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"], [
-   AC_CHECK_LIB(root, load_image,
-       [G_MODULE_LIBS="-lbe -lroot -lglib-2.0 "
-       G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
-       G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule"
-       G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
-       [])
-fi   
-+])
- dnl *** NSLinkModule (dyld) in system libraries (Darwin)
-if test -z "$G_MODULE_IMPL"; then
-+AS_IF([ test -z "$G_MODULE_IMPL" ], [
-  	AC_CHECK_FUNC(NSLinkModule,
- 		      [G_MODULE_IMPL=G_MODULE_IMPL_DYLD
- 		       G_MODULE_NEED_USCORE=1],
- 		      [])
-fi
-+])
- dnl *** dlopen() and dlsym() in libdl
-if test -z "$G_MODULE_IMPL"; then
-+AS_IF([ test -z "$G_MODULE_IMPL"], [
- 	AC_CHECK_LIB(dl, dlopen,
- 		     [AC_CHECK_LIB(dl, dlsym,
- 			           [G_MODULE_LIBS=-ldl
- 		                   G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
- 		     [])
-fi
-+])
- dnl *** shl_load() in libdld (HP-UX)
-if test -z "$G_MODULE_IMPL"; then
-+AS_IF([ test -z "$G_MODULE_IMPL"], [
- 	AC_CHECK_LIB(dld, shl_load,
- 		[G_MODULE_LIBS=-ldld
- 		G_MODULE_IMPL=G_MODULE_IMPL_DLD],
- 		[])
-fi
-+])
- dnl *** additional checks for G_MODULE_IMPL_DL
-if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
-+AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
- 	LIBS_orig="$LIBS"
- 	LDFLAGS_orig="$LDFLAGS"
- 	LIBS="$G_MODULE_LIBS $LIBS"
-@@ -1598,7 +1594,7 @@
- 		[G_MODULE_HAVE_DLERROR=1],
- 		[G_MODULE_HAVE_DLERROR=0])
- 	LIBS="$LIBS_orig"
-fi
-+])
- dnl *** done, have we got an implementation?
- if test -z "$G_MODULE_IMPL"; then
- 	G_MODULE_IMPL=0
-@@ -1683,7 +1679,7 @@
-                              [build without selinux support]))
- msg_selinux=no
- SELINUX_LIBS=
-if test "x$enable_selinux" != "xno"; then
-+AS_IF([ test "x$enable_selinux" != "xno"], [
- 
-  AC_CHECK_LIB(selinux, is_selinux_enabled,
-    [AC_CHECK_HEADERS(selinux/selinux.h,
-@@ -1693,7 +1689,7 @@
-         msg_selinux=yes])
-      ])
-    ])
-fi
-+])
- AC_SUBST(SELINUX_LIBS)
- 
- dnl *****************************
-@@ -1763,7 +1759,7 @@
-               AC_HELP_STRING([--disable-xattr], [build without xattr support]))
- msg_xattr=no
- XATTR_LIBS=
-if test "x$enable_xattr" != "xno"; then
-+AS_IF([ test "x$enable_xattr" != "xno"], [
- 
- dnl either glibc or libattr can provide xattr support
- 
-@@ -1777,7 +1773,7 @@
-       msg_xattr=yes])
-    ])
- 
-  if test "x$msg_xattr" != "xyes"; then
-+  AS_IF([ test "x$msg_xattr" != "xyes"], [
- dnl   failure. try libattr
-    AC_CHECK_LIB(attr, getxattr,
-       [AC_CHECK_HEADERS(attr/xattr.h,
-@@ -1785,9 +1781,9 @@
-         XATTR_LIBS="-lattr"
-         msg_xattr=yes])
-       ])
-  fi
-+  ])
- 
-  if test "x$msg_xattr" = "xyes"; then
-+  AS_IF([ test "x$msg_xattr" = "xyes"], [
-     AC_MSG_CHECKING([for XATTR_NOFOLLOW])
-     AC_TRY_COMPILE([
-       #include <stdio.h>
-@@ -1807,9 +1803,8 @@
-     ],
-     [AC_MSG_RESULT([no])]
-     )
-  fi
-
-fi
-+  ])
-+])
- AC_SUBST(XATTR_LIBS)
- 
- dnl ************************
-@@ -1818,7 +1813,7 @@
- 
- PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
- 
-if test $have_libelf = maybe; then
-+AS_IF([ test $have_libelf = maybe], [
-   glib_save_LIBS=$LIBS
-   AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
-   AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
-@@ -1830,7 +1825,7 @@
-     LIBELF_LIBS=-lelf
-     have_libelf=yes
-   fi
-fi
-+])
- 
- if test $have_libelf = yes; then
-   AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
-@@ -1922,17 +1917,17 @@
- AC_MSG_CHECKING(for thread implementation)
- 
- have_threads=no
-if test "x$with_threads" = xyes || test "x$with_threads" = xposix; then
-+AS_IF([ test "x$with_threads" = xyes || test "x$with_threads" = xposix], [
- 	# -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
- 	# -U_OSF_SOURCE is for Digital UNIX 4.0d
- 	GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
- 	glib_save_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
-        if test "x$have_threads" = xno; then
-+        AS_IF([ test "x$have_threads" = xno], [
-                 AC_TRY_COMPILE([#include <pthread.h>],
- 			[pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;],
- 			have_threads=posix)
-        fi
-+	])
- 	# Tru64Unix requires -pthread to find pthread.h. See #103020
- 	CPPFLAGS="$CPPFLAGS -pthread"
- 	if test "x$have_threads" = xno; then
-@@ -1941,7 +1936,7 @@
- 		       have_threads=posix)
-         fi
- 	CPPFLAGS="$glib_save_CPPFLAGS"
-fi
-+])
- if test "x$with_threads" = xyes || test "x$with_threads" = xwin32; then
-         case $host in
-                 *-*-mingw*)
-@@ -1980,7 +1975,7 @@
-    return (check_me != 42 || ret != &check_me);
- }])
- 
-if test x"$have_threads" = xposix; then
-+AS_IF([ test x"$have_threads" = xposix], [
-   # First we test for posix, whether -pthread or -pthreads do the trick as 
-   # both CPPFLAG and LIBS. 
-   # One of them does for most gcc versions and some other platforms/compilers
-@@ -2015,9 +2010,9 @@
-       done
-        ;;
-   esac
-fi
-+])
- 
-if test x"$G_THREAD_CFLAGS" = x; then
-+AS_IF([ test x"$G_THREAD_CFLAGS" = x], [
- 
-   # The canonical -pthread[s] does not work. Try something different.
- 
-@@ -2056,8 +2051,7 @@
- 		G_THREAD_CFLAGS="-D_REENTRANT" # good default guess otherwise
- 		;;
-   esac
-
-fi
-+])
- 
- # if we are not finding the localtime_r function, then we probably are
- # not using the proper multithread flag
-@@ -2085,11 +2079,10 @@
- dnl determination of G_THREAD_LIBS
- dnl ******************************
- 
-case $have_threads in
-        posix)
-+AS_IF([test x$have_threads = xposix], [
- 	  glib_save_CPPFLAGS="$CPPFLAGS"
- 	  CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
-          if test x"$G_THREAD_LIBS" = x; then
-+          AS_IF([ test x"$G_THREAD_LIBS" = x ], [
-             case $host in
-               *-aix*)
-                 # We are not using gcc (would have set G_THREAD_LIBS) and thus 
-@@ -2135,20 +2128,17 @@
- 		LIBS="$glib_save_LIBS"
-                 ;;
-             esac
-          fi
-+	  ])
- 
- 	  g_threads_impl="POSIX"
- 	  AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
-           CPPFLAGS="$glib_save_CPPFLAGS"
-          ;;
-	win32)
-+], [test x$have_threads = xwin32], [
- 	   g_threads_impl="WIN32"
-	   ;;
-        *)
-+], [
- 	   g_threads_impl="NONE"
-            G_THREAD_LIBS=error
-           ;;
-esac
-+])
- 
- if test "x$G_THREAD_LIBS" = xerror; then
-         AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
-@@ -2174,7 +2164,7 @@
- # to always be linked with the thread libs on some platforms. 
- # LIBS="$LIBS $G_THREAD_LIBS"
- AC_CHECK_FUNCS(localtime_r gmtime_r)
-if test "$ac_cv_header_pwd_h" = "yes"; then
-+AS_IF([ test "$ac_cv_header_pwd_h" = "yes"], [
-  	AC_CACHE_CHECK([for posix getpwuid_r],
- 		ac_cv_func_posix_getpwuid_r,
- 		[AC_TRY_RUN([
-@@ -2212,8 +2202,8 @@
- 				[Have non-POSIX function getpwuid_r])
- 		fi
- 	fi
-fi
-if test "$ac_cv_header_grp_h" = "yes"; then
-+])
-+AS_IF([ test "$ac_cv_header_grp_h" = "yes"], [
-    	AC_CACHE_CHECK([for posix getgrgid_r],
- 		ac_cv_func_posix_getgrgid_r,
- 		[AC_TRY_RUN([
-@@ -2232,10 +2222,10 @@
- 		       [ac_cv_func_posix_getgrgid_r=yes],
- 		       [ac_cv_func_posix_getgrgid_r=no])])
- 	GLIB_ASSERT_SET(ac_cv_func_posix_getgrgid_r)
-	if test "$ac_cv_func_posix_getgrgid_r" = yes; then
-+	AS_IF([ test "$ac_cv_func_posix_getgrgid_r" = yes ], [
- 	   	AC_DEFINE(HAVE_POSIX_GETGRGID_R,1,
- 			[Have POSIX function getgrgid_r])
-	else
-+	], [
- 		AC_CACHE_CHECK([for nonposix getgrgid_r],
- 			ac_cv_func_nonposix_getgrgid_r,
- 			[AC_TRY_LINK([#include <grp.h>],
-@@ -2250,10 +2240,10 @@
- 		   	AC_DEFINE(HAVE_NONPOSIX_GETGRGID_R,1,
- 				[Have non-POSIX function getgrgid_r])
- 		fi
-	fi
-fi
-+	])
-+])
- LIBS="$G_THREAD_LIBS $LIBS"
-if test x"$have_threads" = xposix; then
-+AS_IF([ test x"$have_threads" = xposix], [
-         glib_save_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
-         # This is not AC_CHECK_FUNC to also work with function
-@@ -2277,7 +2267,7 @@
-                 [Have function pthread_condattr_setclock])],
-             [AC_MSG_RESULT(no)])
-         CPPFLAGS="$glib_save_CPPFLAGS"
-fi
-+])
- 
- LIBS="$glib_save_LIBS"
- 
-@@ -2427,8 +2417,8 @@
- #include <sys/poll.h>
- "]
- 
-if test $ac_cv_header_sys_types_h = yes &&
-   test $ac_cv_header_sys_poll_h = yes ; then
-+AS_IF([ test $ac_cv_header_sys_types_h = yes &&
-+   test $ac_cv_header_sys_poll_h = yes ], [
-   glib_failed=false
-   GLIB_CHECK_VALUE(POLLIN, $glib_poll_includes, glib_failed=true)
-   GLIB_CHECK_VALUE(POLLOUT, $glib_poll_includes, glib_failed=true)
-@@ -2439,14 +2429,14 @@
-   if $glib_failed ; then
-     AC_MSG_ERROR([Could not determine values for POLL* constants])
-   fi
-else
-+], [
-   glib_cv_value_POLLIN=1
-   glib_cv_value_POLLOUT=4
-   glib_cv_value_POLLPRI=2
-   glib_cv_value_POLLERR=8
-   glib_cv_value_POLLHUP=16
-   glib_cv_value_POLLNVAL=32
-fi
-+])
- 
- AC_MSG_CHECKING([for broken poll])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-@@ -2487,7 +2477,7 @@
- 
- AM_CONDITIONAL(USE_SYSTEM_PCRE, [test "x$with_pcre" = xsystem])
- 
-if test "x$with_pcre" = xsystem; then
-+AS_IF([ test "x$with_pcre" = xsystem], [
-   PKG_CHECK_MODULES(PCRE,
-                     libpcre >= $PCRE_REQUIRED_VERSION)
-   AC_CACHE_CHECK([for Unicode support in PCRE],glib_cv_pcre_has_unicode,[
-@@ -2519,17 +2509,17 @@
-   AC_DEFINE(USE_SYSTEM_PCRE, [], [using the system-supplied PCRE library])
-   PCRE_REQUIRES=libpcre
-   AC_SUBST(PCRE_REQUIRES)
-else
-+], [
-   # If using gcc 4 pass -Wno-pointer-sign when compiling the internal PCRE
-  if test x"$GCC" = xyes; then
-+  AS_IF([ test x"$GCC" = xyes], [
-     AC_MSG_CHECKING([whether compiler understands -Wno-pointer-sign])
-     save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS -Wno-pointer-sign"
-     AC_TRY_COMPILE([],[],[PCRE_WARN_CFLAGS="$PCRE_WARN_CFLAGS -Wno-pointer-sign"
-                           AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
-     CFLAGS="$save_CFLAGS"
-  fi
-fi
-+  ])
-+])
- AC_SUBST(PCRE_WARN_CFLAGS)
- 
- dnl **********************
-@@ -2568,7 +2558,7 @@
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
-if test $cross_compiling = yes; then
-+AS_IF([ test $cross_compiling = yes ], [
-   AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
-   if test x$GLIB_GENMARSHAL = xno; then
-     AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
-@@ -2583,7 +2573,7 @@
-   if test x$GLIB_COMPILE_RESOURCES = xno; then
-     AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
-   fi
-fi
-+])
- 
- dnl **************************
- dnl *** Checks for gtk-doc ***
-@@ -2623,7 +2613,7 @@
-                               [include tracing support for dtrace])])
- have_dtrace=no
- AC_MSG_CHECKING([whether to include dtrace tracing support])
-if test "x$enable_dtrace" != xno; then
-+AS_IF([ test "x$enable_dtrace" != xno], [
-   if test x$glib_have_carbon = xyes; then
-     AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
-   else 
-@@ -2640,9 +2630,9 @@
-                        fi])
-     fi
-   fi
-else
-+], [
-   AC_MSG_RESULT([no])
-fi
-+])
- if test "x$have_dtrace" = xyes; then
-   AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if using dtrace probes.])
- fi
-@@ -2680,7 +2670,7 @@
- 		 [enable coverage testing with gcov]),
-   [use_gcov=$enableval], [use_gcov=no])
- 
-if test "x$use_gcov" = "xyes"; then
-+AS_IF([ test "x$use_gcov" = "xyes"], [
-   dnl we need gcc:
-   if test "$GCC" != "yes"; then
-     AC_MSG_ERROR([GCC is required for --enable-gcov])
-@@ -2701,7 +2691,7 @@
-   AC_CHECK_PROG(LTP, lcov, lcov)
-   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
- 
-  if test "$LTP"; then
-+  AS_IF([ test "$LTP" ], [
-     AC_CACHE_CHECK([for ltp version], glib_cv_ltp_version, [
-       glib_cv_ltp_version=invalid
-       ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
-@@ -2711,10 +2701,10 @@
-         fi
-       done
-     ])
-  else
-+  ], [
-     ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list"
-     AC_MSG_ERROR([$ltp_msg])
-  fi
-+  ])
- 
-   case $glib_cv_ltp_version in
-     ""|invalid[)]
-@@ -2736,7 +2726,7 @@
-   dnl Add the special gcc flags
-   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-   LDFLAGS="$LDFLAGS -lgcov"
-fi
-+])
- 
- dnl ******************************
- dnl *** output the whole stuff ***
@@ -1,21 +0,0 @@
-diff -Naur glib-2.32.3/configure.ac glib-2.32.3.patch/configure.ac
--- glib-2.32.3/configure.ac	2012-06-01 03:46:38.181436837 +0200
-+++ glib-2.32.3.patch/configure.ac	2012-06-01 03:48:42.622136804 +0200
-@@ -2586,7 +2586,7 @@
-                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-               enable_man=no)
- 
-if test "${enable_man}" != no; then
-+AS_IF([test "${enable_man}" != no], [
- dnl
- dnl Check for xsltproc
- dnl
-@@ -2600,7 +2600,7 @@
-      [DocBook XML DTD V4.1.2],,enable_man=no)
-   JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-      [DocBook XSL Stylesheets],,enable_man=no)
-fi
-+])
- 
- AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
- 
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="Mesa"
-PKG_VERSION="8.0.4"
+PKG_VERSION="8.0.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libpng"
-PKG_VERSION="1.5.12"
+PKG_VERSION="1.5.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="tiff"
-PKG_VERSION="4.0.2"
+PKG_VERSION="4.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libass"
-PKG_VERSION="0.10.0"
+PKG_VERSION="0.10.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="ethtool"
-PKG_VERSION="3.5"
+PKG_VERSION="3.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="iptables"
-PKG_VERSION="1.4.15"
+PKG_VERSION="1.4.16.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -1,19 +0,0 @@
-X-Git-Url: http://git.infradead.org
-
-diff --git a/src/rpc_soc.c b/src/rpc_soc.c
-index c678429..63d2197 100644
--- a/src/rpc_soc.c
-+++ b/src/rpc_soc.c
-@@ -560,12 +560,10 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
- 	u_int recvsz;
- {
- 	struct netbuf *svcaddr;
-	struct netconfig *nconf;
- 	CLIENT *cl;
- 	int len;
- 
- 	cl = NULL;
-	nconf = NULL;
- 	svcaddr = NULL;
- 	if (((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
- 	    ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
@@ -1,637 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7ee8cbc..6731ff9 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
-         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
-         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
-         svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-        auth_time.c auth_des.c authdes_prot.c des_crypt.c
-+        auth_time.c auth_des.c authdes_prot.c
- 
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
-diff --git a/src/auth_des.c b/src/auth_des.c
-index 37e7667..f0c8b8c 100644
--- a/src/auth_des.c
-+++ b/src/auth_des.c
-@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window,
- 		goto failed;
- 	}
- 	ad->ad_nis_srvr = NULL; /* not needed any longer */
-+	auth_get(auth);		/* Reference for caller */
- 	return (auth);
- 
- failed:
-@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth)
- 	FREE(auth, sizeof(AUTH));
- }
- 
-+static bool_t
-+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+	return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authdes_ops(void)
- {
-@@ -487,6 +494,8 @@ authdes_ops(void)
- 		ops.ah_validate = authdes_validate;
- 		ops.ah_refresh = authdes_refresh;
- 		ops.ah_destroy = authdes_destroy;
-+		ops.ah_wrap = authdes_wrap;
-+		ops.ah_unwrap = authdes_wrap;
-         }
- 	mutex_unlock(&authdes_ops_lock);
- 	return (&ops);
-diff --git a/src/auth_gss.c b/src/auth_gss.c
-index df3017a..a992049 100644
--- a/src/auth_gss.c
-+++ b/src/auth_gss.c
-@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
- 
- 	if (!authgss_refresh(auth))
- 		auth = NULL;
-+	else
-+		auth_get(auth); /* Reference for caller */
- 
- 	clnt->cl_auth = save_auth;
- 
-@@ -555,9 +557,20 @@ authgss_destroy_context(AUTH *auth)
- 
- 	if (gd->gc.gc_ctx.length != 0) {
- 		if (gd->established) {
-+			AUTH *save_auth = NULL;
-+
-+			/* Make sure we use the right auth_ops */
-+			if (gd->clnt->cl_auth != auth) {
-+				save_auth = gd->clnt->cl_auth;
-+				gd->clnt->cl_auth = auth;
-+			}
-+
- 			gd->gc.gc_proc = RPCSEC_GSS_DESTROY;
- 			clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL,
- 				  (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT);
-+			
-+			if (save_auth != NULL)
-+				gd->clnt->cl_auth = save_auth;
- 		}
- 		gss_release_buffer(&min_stat, &gd->gc.gc_ctx);
- 		/* XXX ANDROS check size of context  - should be 8 */
-diff --git a/src/auth_none.c b/src/auth_none.c
-index a439ec6..008c589 100644
--- a/src/auth_none.c
-+++ b/src/auth_none.c
-@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client)
- {
- }
- 
-+static bool_t
-+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+	return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authnone_ops()
- {
-@@ -170,6 +176,8 @@ authnone_ops()
- 		ops.ah_validate = authnone_validate;
- 		ops.ah_refresh = authnone_refresh;
- 		ops.ah_destroy = authnone_destroy;
-+		ops.ah_wrap = authnone_wrap;
-+		ops.ah_unwrap = authnone_wrap;
- 	}
- 	mutex_unlock(&ops_lock);
- 	return (&ops);
-diff --git a/src/auth_unix.c b/src/auth_unix.c
-index c2469da..4b9b13f 100644
--- a/src/auth_unix.c
-+++ b/src/auth_unix.c
-@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids)
- 	 */
- 	auth->ah_cred = au->au_origcred;
- 	marshal_new_auth(auth);
-+	auth_get(auth);		/* Reference for caller */
- 	return (auth);
- #ifndef _KERNEL
-  cleanup_authunix_create:
-@@ -396,6 +397,12 @@ marshal_new_auth(auth)
- 	XDR_DESTROY(xdrs);
- }
- 
-+static bool_t
-+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere)
-+{
-+	return ((*xfunc)(xdrs, xwhere));
-+}
-+
- static struct auth_ops *
- authunix_ops()
- {
-@@ -411,6 +418,8 @@ authunix_ops()
- 		ops.ah_validate = authunix_validate;
- 		ops.ah_refresh = authunix_refresh;
- 		ops.ah_destroy = authunix_destroy;
-+		ops.ah_wrap = authunix_wrap;
-+		ops.ah_unwrap = authunix_wrap;
- 	}
- 	mutex_unlock(&ops_lock);
- 	return (&ops);
-diff --git a/src/authgss_prot.c b/src/authgss_prot.c
-index 9d7fa09..0168318 100644
--- a/src/authgss_prot.c
-+++ b/src/authgss_prot.c
-@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- 	databuflen = end - start - 4;
- 	XDR_SETPOS(xdrs, start + 4);
- 	databuf.value = XDR_INLINE(xdrs, databuflen);
-+	databuf.length = databuflen;
- 
- 	xdr_stat = FALSE;
- 
-@@ -169,7 +170,6 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
- 		XDR_SETPOS(xdrs, start);
- 		if (!xdr_u_int(xdrs, (u_int *)&databuflen))
- 			return (FALSE);
-		databuf.length = databuflen;
- 
- 		/* Checksum rpc_gss_data_t. */
- 		maj_stat = gss_get_mic(&min_stat, ctx, qop,
-diff --git a/src/clnt_dg.c b/src/clnt_dg.c
-index 79fed5d..4a1f60a 100644
--- a/src/clnt_dg.c
-+++ b/src/clnt_dg.c
-@@ -366,7 +366,7 @@ call_again:
- 
- 	if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
- 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, argsp))) {
-+	    (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) {
- 		cu->cu_error.re_status = RPC_CANTENCODEARGS;
- 		goto out;
- 	}
-@@ -400,8 +400,8 @@ get_reply:
- 	 * (We assume that this is actually only executed once.)
- 	 */
- 	reply_msg.acpted_rply.ar_verf = _null_auth;
-	reply_msg.acpted_rply.ar_results.where = resultsp;
-	reply_msg.acpted_rply.ar_results.proc = xresults;
-+	reply_msg.acpted_rply.ar_results.where = NULL;
-+	reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
- 
-         fd.fd = cu->cu_fd;
-         fd.events = POLLIN;
-@@ -512,6 +512,10 @@ get_reply:
- 					    &reply_msg.acpted_rply.ar_verf)) {
- 				cu->cu_error.re_status = RPC_AUTHERROR;
- 				cu->cu_error.re_why = AUTH_INVALIDRESP;
-+			} else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs,
-+						 xresults, resultsp)) {
-+				if (cu->cu_error.re_status == RPC_SUCCESS)
-+				     cu->cu_error.re_status = RPC_CANTDECODERES;
- 			}
- 			if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
- 				xdrs->x_op = XDR_FREE;
-diff --git a/src/clnt_vc.c b/src/clnt_vc.c
-index 359063c..097cae8 100644
--- a/src/clnt_vc.c
-+++ b/src/clnt_vc.c
-@@ -364,7 +364,7 @@ call_again:
- 	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
- 	    (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
- 	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-	    (! (*xdr_args)(xdrs, args_ptr))) {
-+	    (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) {
- 		if (ct->ct_error.re_status == RPC_SUCCESS)
- 			ct->ct_error.re_status = RPC_CANTENCODEARGS;
- 		(void)xdrrec_endofrecord(xdrs, TRUE);
-@@ -420,7 +420,8 @@ call_again:
- 		    &reply_msg.acpted_rply.ar_verf)) {
- 			ct->ct_error.re_status = RPC_AUTHERROR;
- 			ct->ct_error.re_why = AUTH_INVALIDRESP;
-		} else if (! (*xdr_results)(xdrs, results_ptr)) {
-+		} else if (! AUTH_UNWRAP(cl->cl_auth, xdrs,
-+					 xdr_results, results_ptr)) {
- 			if (ct->ct_error.re_status == RPC_SUCCESS)
- 				ct->ct_error.re_status = RPC_CANTDECODERES;
- 		}
-diff --git a/src/svc.c b/src/svc.c
-index b4a63d0..08cd6c9 100644
--- a/src/svc.c
-+++ b/src/svc.c
-@@ -77,9 +77,6 @@ static struct svc_callout
- 
- extern rwlock_t svc_lock;
- extern rwlock_t svc_fd_lock;
-#ifdef HAVE_LIBGSSAPI
-extern struct svc_auth_ops svc_auth_gss_ops;
-#endif
- 
- static struct svc_callout *svc_find (rpcprog_t, rpcvers_t,
- 				     struct svc_callout **, char *);
-@@ -717,11 +714,9 @@ svc_getreq_common (fd)
- 	  SVC_DESTROY (xprt);
- 	  break;
- 	}
-    else if ((xprt->xp_auth != NULL) 
-#ifdef HAVE_LIBGSSAPI
-	  	&& (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops)
-#endif
-	) {
-+    else if ((xprt->xp_auth != NULL) &&
-+	     (xprt->xp_auth->svc_ah_private == NULL))
-+	{
- 	  xprt->xp_auth = NULL;
- 	}
-     }
-diff --git a/src/svc_auth.c b/src/svc_auth.c
-index c6b3a0b..e80d5f9 100644
--- a/src/svc_auth.c
-+++ b/src/svc_auth.c
-@@ -98,8 +98,8 @@ _authenticate(rqst, msg)
- 	rqst->rq_xprt->xp_verf.oa_length = 0;
- 	cred_flavor = rqst->rq_cred.oa_flavor;
- 	switch (cred_flavor) {
-	case AUTH_NULL:
-		dummy = _svcauth_null(rqst, msg);
-+	case AUTH_NONE:
-+		dummy = _svcauth_none(rqst, msg);
- 		return (dummy);
- 	case AUTH_SYS:
- 		dummy = _svcauth_unix(rqst, msg);
-@@ -132,15 +132,6 @@ _authenticate(rqst, msg)
- 	return (AUTH_REJECTEDCRED);
- }
- 
-/*ARGSUSED*/
-enum auth_stat
-_svcauth_null(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	return (AUTH_OK);
-}
-
- /*
-  *  Allow the rpc service to register new authentication types that it is
-  *  prepared to handle.  When an authentication flavor is registered,
-diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c
-index ce83859..9585069 100644
--- a/src/svc_auth_unix.c
-+++ b/src/svc_auth_unix.c
-@@ -43,6 +43,8 @@
- 
- #include <rpc/rpc.h>
- 
-+extern SVCAUTH svc_auth_none;
-+
- /*
-  * Unix longhand authenticator
-  */
-@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg)
- 	assert(rqst != NULL);
- 	assert(msg != NULL);
- 
-+	rqst->rq_xprt->xp_auth = &svc_auth_none;
-+
- 	area = (struct area *) rqst->rq_clntcred;
- 	aup = &area->area_aup;
- 	aup->aup_machname = area->area_machname;
-@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg)
- 	struct svc_req *rqst;
- 	struct rpc_msg *msg;
- {
-+	rqst->rq_xprt->xp_auth = &svc_auth_none;
- 	return (AUTH_REJECTEDCRED);
- }
-diff --git a/src/svc_dg.c b/src/svc_dg.c
-index 66a56ee..5ef9df2 100644
--- a/src/svc_dg.c
-+++ b/src/svc_dg.c
-@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize)
- 	su->su_cache = NULL;
- 	xprt->xp_fd = fd;
- 	xprt->xp_p2 = su;
-+	xprt->xp_auth = NULL;
- 	xprt->xp_verf.oa_base = su->su_verfbody;
- 	svc_dg_ops(xprt);
- 	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg)
- 	bool_t stat = FALSE;
- 	size_t slen;
- 
-+	xdrproc_t xdr_results;
-+	caddr_t xdr_location;
-+	bool_t has_args;
-+
-+	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-+	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-+		has_args = TRUE;
-+		xdr_results = msg->acpted_rply.ar_results.proc;
-+		xdr_location = msg->acpted_rply.ar_results.where;
-+
-+		msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-+		msg->acpted_rply.ar_results.where = NULL;
-+	} else
-+		has_args = FALSE;
-+
- 	xdrs->x_op = XDR_ENCODE;
- 	XDR_SETPOS(xdrs, 0);
- 	msg->rm_xid = su->su_xid;
-	if (xdr_replymsg(xdrs, msg)) {
-+	if (xdr_replymsg(xdrs, msg) &&
-+	    (!has_args ||
-+	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
- 		struct msghdr *msg = &su->su_msghdr;
- 		struct iovec iov;
- 
-@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr)
- 	xdrproc_t xdr_args;
- 	void *args_ptr;
- {
-	return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr);
-+	if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs),
-+			     xdr_args, args_ptr)) {
-+		(void)svc_freeargs(xprt, xdr_args, args_ptr);
-+		return FALSE;
-+	}
-+	return TRUE;
- }
- 
- static bool_t
-@@ -288,6 +311,10 @@ svc_dg_destroy(xprt)
- 	xprt_unregister(xprt);
- 	if (xprt->xp_fd != -1)
- 		(void)close(xprt->xp_fd);
-+	if (xprt->xp_auth != NULL) {
-+		SVCAUTH_DESTROY(xprt->xp_auth);
-+		xprt->xp_auth = NULL;
-+	}
- 	XDR_DESTROY(&(su->su_xdrs));
- 	(void) mem_free(rpc_buffer(xprt), su->su_iosz);
- 	(void) mem_free(su, sizeof (*su));
-diff --git a/src/svc_vc.c b/src/svc_vc.c
-index aaaf2d7..74632e2 100644
--- a/src/svc_vc.c
-+++ b/src/svc_vc.c
-@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize)
- 	xprt->xp_p1 = r;
- 	xprt->xp_p2 = NULL;
- 	xprt->xp_p3 = NULL;
-+	xprt->xp_auth = NULL;
- 	xprt->xp_verf = _null_auth;
- 	svc_vc_rendezvous_ops(xprt);
- 	xprt->xp_port = (u_short)-1;	/* It is the rendezvouser */
-@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize)
- 	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
- 	    xprt, read_vc, write_vc);
- 	xprt->xp_p1 = cd;
-+	xprt->xp_auth = NULL;
- 	xprt->xp_verf.oa_base = cd->verf_body;
- 	svc_vc_ops(xprt);  /* truely deals with calls */
- 	xprt->xp_port = 0;  /* this is a connection, not a rendezvouser */
-@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt)
- 		XDR_DESTROY(&(cd->xdrs));
- 		mem_free(cd, sizeof(struct cf_conn));
- 	}
-+	if (xprt->xp_auth != NULL) {
-+		SVCAUTH_DESTROY(xprt->xp_auth);
-+		xprt->xp_auth = NULL;
-+	}
- 	if (xprt->xp_rtaddr.buf)
- 		mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
- 	if (xprt->xp_ltaddr.buf)
-@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg)
- 	}
- 
- 	xdrs->x_op = XDR_DECODE;
-	(void)xdrrec_skiprecord(xdrs);
-+	/*
-+	 * No need skip records with nonblocking connections
-+	 */
-+	if (cd->nonblock == FALSE)
-+		(void)xdrrec_skiprecord(xdrs);
- 	if (xdr_callmsg(xdrs, msg)) {
- 		cd->x_id = msg->rm_xid;
- 		return (TRUE);
-@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr)
- 
- 	assert(xprt != NULL);
- 	/* args_ptr may be NULL */
-	return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-	    args_ptr));
-+
-+	if (! SVCAUTH_UNWRAP(xprt->xp_auth,
-+			     &(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-+			     xdr_args, args_ptr)) {
-+		return FALSE;  
-+	}
-+	return TRUE;
- }
- 
- static bool_t
-@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg)
- 	XDR *xdrs;
- 	bool_t rstat;
- 
-+	xdrproc_t xdr_results;
-+	caddr_t xdr_location;
-+	bool_t has_args;
-+
- 	assert(xprt != NULL);
- 	assert(msg != NULL);
- 
- 	cd = (struct cf_conn *)(xprt->xp_p1);
- 	xdrs = &(cd->xdrs);
- 
-+	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-+	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-+		has_args = TRUE;
-+		xdr_results = msg->acpted_rply.ar_results.proc;
-+		xdr_location = msg->acpted_rply.ar_results.where;
-+
-+		msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-+		msg->acpted_rply.ar_results.where = NULL;
-+	} else
-+		has_args = FALSE;
-+
- 	xdrs->x_op = XDR_ENCODE;
- 	msg->rm_xid = cd->x_id;
-	rstat = xdr_replymsg(xdrs, msg);
-+	rstat = FALSE;
-+	if (xdr_replymsg(xdrs, msg) &&
-+	    (!has_args ||
-+	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
-+		rstat = TRUE;
-+	}
- 	(void)xdrrec_endofrecord(xdrs, TRUE);
- 	return (rstat);
- }
-diff --git a/src/xdr_rec.c b/src/xdr_rec.c
-index 4e815d7..2aca623 100644
--- a/src/xdr_rec.c
-+++ b/src/xdr_rec.c
-@@ -64,7 +64,6 @@
- #include <rpc/clnt.h>
- #include <stddef.h>
- #include "rpc_com.h"
-#include <unistd.h>
- static bool_t	xdrrec_getlong(XDR *, long *);
- static bool_t	xdrrec_putlong(XDR *, const long *);
- static bool_t	xdrrec_getbytes(XDR *, char *, u_int);
-@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs)
- 	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
- 	off_t pos;
- 
-	pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
-	if (pos != -1)
-		switch (xdrs->x_op) {
-+	switch (xdrs->x_op) {
- 
-		case XDR_ENCODE:
-			pos += rstrm->out_finger - rstrm->out_base;
-			break;
-+	case XDR_ENCODE:
-+		pos = rstrm->out_finger - rstrm->out_base
-+			- BYTES_PER_XDR_UNIT;
-+		break;
- 
-		case XDR_DECODE:
-			pos -= rstrm->in_boundry - rstrm->in_finger;
-			break;
-+	case XDR_DECODE:
-+		pos = rstrm->in_boundry - rstrm->in_finger
-+			- BYTES_PER_XDR_UNIT;
-+		break;
- 
-		default:
-			pos = (off_t) -1;
-			break;
-		}
-+	default:
-+		pos = (off_t) -1;
-+		break;
-+	}
- 	return ((u_int) pos);
- }
- 
-diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
-index 734e6b9..5f66e67 100644
--- a/tirpc/rpc/auth.h
-+++ b/tirpc/rpc/auth.h
-@@ -203,8 +203,22 @@ typedef struct __auth {
- 
- 	} *ah_ops;
- 	void *ah_private;
-+	int ah_refcnt;
- } AUTH;
- 
-+static __inline int
-+auth_get(AUTH *auth)
-+{
-+	return __sync_add_and_fetch(&auth->ah_refcnt, 1);
-+}
-+
-+static __inline int
-+auth_put(AUTH *auth)
-+{
-+	return __sync_sub_and_fetch(&auth->ah_refcnt, 1);
-+}
-+
-+
- 
- /*
-  * Authentication ops.
-@@ -234,10 +248,23 @@ typedef struct __auth {
- #define auth_refresh(auth, msg)		\
- 		((*((auth)->ah_ops->ah_refresh))(auth, msg))
- 
-#define AUTH_DESTROY(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-#define auth_destroy(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-+#define AUTH_DESTROY(auth)						\
-+		do {							\
-+			int refs;					\
-+			if ((refs = auth_put((auth))) == 0)		\
-+				((*((auth)->ah_ops->ah_destroy))(auth));\
-+			log_debug("%s: auth_put(), refs %d\n",		\
-+				__func__, refs);			\
-+		} while (0)
-+
-+#define auth_destroy(auth)						\
-+		do {							\
-+			int refs;					\
-+			if ((refs = auth_put((auth))) == 0)		\
-+				((*((auth)->ah_ops->ah_destroy))(auth));\
-+			log_debug("%s: auth_put(), refs %d\n",		\
-+				__func__, refs);			\
-+		} while (0)
- 
- #define AUTH_WRAP(auth, xdrs, xfunc, xwhere)            \
- 		((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \
-@@ -373,7 +400,7 @@ __END_DECLS
- __BEGIN_DECLS
- struct svc_req;
- struct rpc_msg;
-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
-+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
- __END_DECLS
-diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
-index e3d6897..d2881ad 100644
--- a/tirpc/rpc/des.h
-+++ b/tirpc/rpc/des.h
-@@ -33,6 +33,9 @@
-  * Copyright (c) 1986 by Sun Microsystems, Inc.
-  */
- 
-+#ifndef _RPC_DES_H_
-+#define _RPC_DES_H_
-+
- #define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
- #define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
- 
-@@ -80,3 +83,5 @@ struct desparams {
-  * Software DES.
-  */
- extern int _des_crypt( char *, int, struct desparams * );
-+
-+#endif
-diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h
-index 659e90c..14269d1 100644
--- a/tirpc/rpc/svc_auth.h
-+++ b/tirpc/rpc/svc_auth.h
-@@ -44,17 +44,23 @@
- /*
-  * Interface to server-side authentication flavors.
-  */
-typedef struct {
-+typedef struct SVCAUTH {
- 	struct svc_auth_ops {
-		int   (*svc_ah_wrap)(void);
-		int   (*svc_ah_unwrap)(void);
-		int   (*svc_ah_destroy)(void);
-+		int     (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t,
-+				       caddr_t);
-+		int     (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t,
-+					 caddr_t);
-+		int     (*svc_ah_destroy)(struct SVCAUTH *);
- 		} *svc_ah_ops;
- 	caddr_t svc_ah_private;
- } SVCAUTH;
- 
-#define SVCAUTH_DESTROY(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
-#define svcauth_destroy(cred)		((*(cred)->svc_ah_ops->svc_ah_destroy)())
-+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \
-+	((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere))
-+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \
-+	((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere))
-+#define SVCAUTH_DESTROY(auth) \
-+	((*((auth)->svc_ah_ops->svc_ah_destroy))(auth))
- 
- /*
-  * Server side authenticator
@@ -1,28 +0,0 @@
-diff -up libtirpc-0.2.2/src/svc_dg.c.orig libtirpc-0.2.2/src/svc_dg.c
--- libtirpc-0.2.2/src/svc_dg.c.orig	2011-07-19 15:02:41.087631000 -0400
-+++ libtirpc-0.2.2/src/svc_dg.c	2011-07-19 15:04:43.154243000 -0400
-@@ -254,8 +254,8 @@ svc_dg_reply(xprt, msg)
- 	XDR_SETPOS(xdrs, 0);
- 	msg->rm_xid = su->su_xid;
- 	if (xdr_replymsg(xdrs, msg) &&
-	    (!has_args ||
-	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
-+	    (!has_args || (xprt->xp_auth &&
-+	     SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
- 		struct msghdr *msg = &su->su_msghdr;
- 		struct iovec iov;
- 
-diff -up libtirpc-0.2.2/src/svc_vc.c.orig libtirpc-0.2.2/src/svc_vc.c
--- libtirpc-0.2.2/src/svc_vc.c.orig	2011-07-19 15:05:28.577588000 -0400
-+++ libtirpc-0.2.2/src/svc_vc.c	2011-07-19 15:05:40.058928000 -0400
-@@ -698,8 +698,8 @@ svc_vc_reply(xprt, msg)
- 	msg->rm_xid = cd->x_id;
- 	rstat = FALSE;
- 	if (xdr_replymsg(xdrs, msg) &&
-	    (!has_args ||
-	     (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
-+	    (!has_args || (xprt->xp_auth &&
-+	     SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) {
- 		rstat = TRUE;
- 	}
- 	(void)xdrrec_endofrecord(xdrs, TRUE);
@@ -30,11 +30,11 @@ cd $PKG_BUILD
            --disable-static \
            --enable-shared \
            --disable-all-clocks \
-            --disable-ipv6 \
+            --enable-ipv6 \
            --without-rpath \
            --with-gnu-ld \
            --without-crypto

 make -C sntp/libopts
 make -C ntpd
-make -C ntpdate
+make -C ntpdate
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="samba"
-PKG_VERSION="3.6.7"
+PKG_VERSION="3.6.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -1,31 +1,22 @@
--- a/source3/rpc_server/rpc_ep_setup.c
-+++ b/source3/rpc_server/rpc_ep_setup.c
-@@ -1110,6 +1110,10 @@ bool dcesrv_ep_setup(struct tevent_conte
- 					   "rpc_server",
- 					   "spoolss",
- 					   "embedded");
-+#ifndef PRINTER_SUPPORT
-+	if (1) {
-+	} else
-+#endif
- 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
- 		spoolss_cb.init         = spoolss_init_cb;
- 		spoolss_cb.shutdown     = spoolss_shutdown_cb;
--- a/source3/rpcclient/rpcclient.c
-+++ b/source3/rpcclient/rpcclient.c
-@@ -624,7 +624,9 @@ static struct cmd_set *rpcclient_command
- 	lsarpc_commands,
- 	ds_commands,
- 	samr_commands,
+diff -Naur samba-3.6.8/source3/librpc/rpc/rpc_common.c samba-3.6.8.patch/source3/librpc/rpc/rpc_common.c
+--- samba-3.6.8/source3/librpc/rpc/rpc_common.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/librpc/rpc/rpc_common.c	2012-10-22 21:17:48.583839804 +0200
+@@ -113,9 +113,11 @@
+ 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
+ 		return false;
+ 	}
 +#ifdef PRINTER_SUPPORT
- 	spoolss_commands,
+ 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
+ 		return false;
+ 	}
 +#endif
- 	netlogon_commands,
- 	srvsvc_commands,
- 	dfs_commands,
--- a/source3/printing/spoolssd.c
-+++ b/source3/printing/spoolssd.c
-@@ -153,6 +153,10 @@ void start_spoolssd(struct tevent_contex
+ 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
+ 		return false;
+ 	}
+diff -Naur samba-3.6.8/source3/printing/spoolssd.c samba-3.6.8.patch/source3/printing/spoolssd.c
+--- samba-3.6.8/source3/printing/spoolssd.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/printing/spoolssd.c	2012-10-22 21:17:48.566839461 +0200
+@@ -153,6 +153,10 @@
 	NTSTATUS status;
 	int ret;
 
@@ -36,22 +27,241 @@
 	DEBUG(1, ("Forking SPOOLSS Daemon\n"));
 
 	pid = sys_fork();
--- a/source3/utils/net_rpc.c
-+++ b/source3/utils/net_rpc.c
-@@ -7791,6 +7791,10 @@ int net_rpc_printer(struct net_context *
- 		{NULL, NULL, 0, NULL, NULL}
- 	};
+diff -Naur samba-3.6.8/source3/rpcclient/rpcclient.c samba-3.6.8.patch/source3/rpcclient/rpcclient.c
+--- samba-3.6.8/source3/rpcclient/rpcclient.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/rpcclient/rpcclient.c	2012-10-22 21:17:48.565839442 +0200
+@@ -624,7 +624,9 @@
+ 	lsarpc_commands,
+ 	ds_commands,
+ 	samr_commands,
+#ifdef PRINTER_SUPPORT
+ 	spoolss_commands,
+#endif
+ 	netlogon_commands,
+ 	srvsvc_commands,
+ 	dfs_commands,
+diff -Naur samba-3.6.8/source3/rpc_server/rpc_ep_setup.c samba-3.6.8.patch/source3/rpc_server/rpc_ep_setup.c
+--- samba-3.6.8/source3/rpc_server/rpc_ep_setup.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/rpc_server/rpc_ep_setup.c	2012-10-22 21:17:48.564839423 +0200
+@@ -1110,6 +1110,10 @@
+ 					   "rpc_server",
+ 					   "spoolss",
+ 					   "embedded");
+#ifndef PRINTER_SUPPORT
+	if (1) {
+	} else
+#endif
+ 	if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
+ 		spoolss_cb.init         = spoolss_init_cb;
+ 		spoolss_cb.shutdown     = spoolss_shutdown_cb;
+diff -Naur samba-3.6.8/source3/rpc_server/svcctl/srv_svcctl_nt.c samba-3.6.8.patch/source3/rpc_server/svcctl/srv_svcctl_nt.c
+--- samba-3.6.8/source3/rpc_server/svcctl/srv_svcctl_nt.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/rpc_server/svcctl/srv_svcctl_nt.c	2012-10-22 21:17:48.582839784 +0200
+@@ -85,9 +85,11 @@
+ 
+ 	/* add builtin services */
+ 
+#ifdef PRINTER_SUPPORT
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" );
+ 	svcctl_ops[i].ops  = &spoolss_svc_ops;
+ 	i++;
+#endif
+ 
+ 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+ 	svcctl_ops[i].ops  = &netlogon_svc_ops;
+diff -Naur samba-3.6.8/source3/smbd/close.c samba-3.6.8.patch/source3/smbd/close.c
+--- samba-3.6.8/source3/smbd/close.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/close.c	2012-10-22 21:17:48.579839724 +0200
+@@ -643,6 +643,9 @@
+ 	status = ntstatus_keeperror(status, tmp);
+ 
+ 	if (fsp->print_file) {
+#ifndef PRINTER_SUPPORT
+		return NT_STATUS_OK;
+#endif
+ 		/* FIXME: return spool errors */
+ 		print_spool_end(fsp, close_type);
+ 		file_free(req, fsp);
+diff -Naur samba-3.6.8/source3/smbd/fileio.c samba-3.6.8.patch/source3/smbd/fileio.c
+--- samba-3.6.8/source3/smbd/fileio.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/fileio.c	2012-10-22 21:17:48.580839744 +0200
+@@ -298,6 +298,10 @@
+ 		uint32_t t;
+ 		int ret;
 
 +#ifndef PRINTER_SUPPORT
-+	return 0;
+		return -1;
 +#endif
 +
- 	if (argc == 0) {
- 		if (c->display_usage) {
- 			d_printf(_("Usage:\n"));
--- a/source3/smbd/reply.c
-+++ b/source3/smbd/reply.c
-@@ -5194,7 +5194,11 @@ void reply_printopen(struct smb_request 
+ 		ret = print_spool_write(fsp, data, n, pos, &t);
+ 		if (ret) {
+ 			errno = ret;
+diff -Naur samba-3.6.8/source3/smbd/lanman.c samba-3.6.8.patch/source3/smbd/lanman.c
+--- samba-3.6.8/source3/smbd/lanman.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/lanman.c	2012-10-22 21:17:48.576839664 +0200
+@@ -784,6 +784,10 @@
+ 	union spoolss_JobInfo *job_info = NULL;
+ 	union spoolss_PrinterInfo printer_info;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -999,6 +1003,10 @@
+ 	union spoolss_DriverInfo *driver_info;
+ 	union spoolss_JobInfo **job_info;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!param_format || !output_format1 || !p) {
+ 		return False;
+ 	}
+@@ -3350,6 +3358,10 @@
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	enum spoolss_JobControl command;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -3483,6 +3495,10 @@
+ 	struct sec_desc_buf secdesc_ctr;
+ 	enum spoolss_PrinterControl command;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !QueueName) {
+ 		return False;
+ 	}
+@@ -3649,6 +3665,10 @@
+ 	union spoolss_JobInfo info;
+ 	struct spoolss_SetJobInfo1 info1;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4792,6 +4812,10 @@
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_JobInfo info;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -4930,6 +4954,10 @@
+ 	uint32_t count = 0;
+ 	union spoolss_JobInfo *info;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5135,6 +5163,10 @@
+ 	struct spoolss_DevmodeContainer devmode_ctr;
+ 	union spoolss_PrinterInfo info;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5271,6 +5303,10 @@
+ 	union spoolss_PrinterInfo *info;
+ 	uint32_t count;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5374,6 +5410,10 @@
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5438,6 +5478,10 @@
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+@@ -5502,6 +5546,10 @@
+ 	int succnt;
+ 	struct pack_desc desc;
+ 
+#ifndef PRINTER_SUPPORT
+	return False;
+#endif
+
+ 	if (!str1 || !str2 || !p) {
+ 		return False;
+ 	}
+diff -Naur samba-3.6.8/source3/smbd/open.c samba-3.6.8.patch/source3/smbd/open.c
+--- samba-3.6.8/source3/smbd/open.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/open.c	2012-10-22 21:17:48.578839704 +0200
+@@ -1546,6 +1546,9 @@
+ 		 * Most of the passed parameters are ignored.
+ 		 */
+ 
+#ifndef PRINTER_SUPPORT
+		return NT_STATUS_ACCESS_DENIED;
+#endif
+ 		if (pinfo) {
+ 			*pinfo = FILE_WAS_CREATED;
+ 		}
+diff -Naur samba-3.6.8/source3/smbd/process.c samba-3.6.8.patch/source3/smbd/process.c
+--- samba-3.6.8/source3/smbd/process.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/process.c	2012-10-22 21:17:48.584839824 +0200
+@@ -2475,8 +2475,10 @@
+ 
+ 	change_to_root_user();
+ 
+#ifdef PRINTER_SUPPORT
+ 	/* update printer queue caches if necessary */
+ 	update_monitored_printq_cache(sconn->msg_ctx);
+#endif
+ 
+ 	/* check if we need to reload services */
+ 	check_reload(sconn, time_mono(NULL));
+diff -Naur samba-3.6.8/source3/smbd/reply.c samba-3.6.8.patch/source3/smbd/reply.c
+--- samba-3.6.8/source3/smbd/reply.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/reply.c	2012-10-22 21:17:48.573839604 +0200
+@@ -5196,7 +5196,11 @@
 		return;
 	}
 
@@ -64,7 +274,7 @@
 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
 		END_PROFILE(SMBsplopen);
 		return;
-@@ -5300,7 +5304,10 @@ void reply_printqueue(struct smb_request
+@@ -5302,7 +5306,10 @@
 	   is really quite gross and only worked when there was only
 	   one printer - I think we should now only accept it if they
 	   get it right (tridge) */
@@ -76,143 +286,40 @@
 		reply_nterror(req, NT_STATUS_ACCESS_DENIED);
 		END_PROFILE(SMBsplretq);
 		return;
--- a/source3/smbd/lanman.c
-+++ b/source3/smbd/lanman.c
-@@ -784,6 +784,10 @@ static bool api_DosPrintQGetInfo(struct 
- 	union spoolss_JobInfo *job_info = NULL;
- 	union spoolss_PrinterInfo printer_info;
- 
+diff -Naur samba-3.6.8/source3/smbd/server.c samba-3.6.8.patch/source3/smbd/server.c
+--- samba-3.6.8/source3/smbd/server.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/server.c	2012-10-22 21:19:58.704461862 +0200
+@@ -126,7 +126,9 @@
+ {
+ 	struct tevent_context *ev_ctx =
+ 		talloc_get_type_abort(private_data, struct tevent_context);
+-
 +#ifndef PRINTER_SUPPORT
-+	return False;
+	return;
 +#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
+ 	DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
+ 	change_to_root_user();
+ 	reload_printers(ev_ctx, msg);
+@@ -1254,6 +1256,7 @@
+ 		exit(1);
 	}
-@@ -999,6 +1003,10 @@ static bool api_DosPrintQEnum(struct smb
- 	union spoolss_DriverInfo *driver_info;
- 	union spoolss_JobInfo **job_info;
 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!param_format || !output_format1 || !p) {
- 		return False;
+#ifdef PRINTER_SUPPORT
+ 	/*
+ 	 * The print backend init also migrates the printing tdb's,
+ 	 * this requires a winreg pipe.
+@@ -1289,6 +1292,7 @@
+ 				       smbd_messaging_context());
+ 		}
 	}
-@@ -3350,6 +3358,10 @@ static bool api_RDosPrintJobDel(struct s
- 	struct spoolss_DevmodeContainer devmode_ctr;
- 	enum spoolss_JobControl command;
+#endif
 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -3483,6 +3495,10 @@ static bool api_WPrintQueueCtrl(struct s
- 	struct sec_desc_buf secdesc_ctr;
- 	enum spoolss_PrinterControl command;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !QueueName) {
- 		return False;
- 	}
-@@ -3649,6 +3665,10 @@ static bool api_PrintJobInfo(struct smbd
- 	union spoolss_JobInfo info;
- 	struct spoolss_SetJobInfo1 info1;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -4792,6 +4812,10 @@ static bool api_WPrintJobGetInfo(struct 
- 	struct spoolss_DevmodeContainer devmode_ctr;
- 	union spoolss_JobInfo info;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -4930,6 +4954,10 @@ static bool api_WPrintJobEnumerate(struc
- 	uint32_t count = 0;
- 	union spoolss_JobInfo *info;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -5135,6 +5163,10 @@ static bool api_WPrintDestGetInfo(struct
- 	struct spoolss_DevmodeContainer devmode_ctr;
- 	union spoolss_PrinterInfo info;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -5271,6 +5303,10 @@ static bool api_WPrintDestEnum(struct sm
- 	union spoolss_PrinterInfo *info;
- 	uint32_t count;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -5374,6 +5410,10 @@ static bool api_WPrintDriverEnum(struct 
- 	int succnt;
- 	struct pack_desc desc;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -5438,6 +5478,10 @@ static bool api_WPrintQProcEnum(struct s
- 	int succnt;
- 	struct pack_desc desc;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
-@@ -5502,6 +5546,10 @@ static bool api_WPrintPortEnum(struct sm
- 	int succnt;
- 	struct pack_desc desc;
- 
-+#ifndef PRINTER_SUPPORT
-+	return False;
-+#endif
-+
- 	if (!str1 || !str2 || !p) {
- 		return False;
- 	}
--- a/source3/smbd/server_exit.c
-+++ b/source3/smbd/server_exit.c
-@@ -142,7 +142,9 @@ static void exit_server_common(enum serv
+ 	if (!is_daemon) {
+ 		/* inetd mode */
+diff -Naur samba-3.6.8/source3/smbd/server_exit.c samba-3.6.8.patch/source3/smbd/server_exit.c
+--- samba-3.6.8/source3/smbd/server_exit.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/server_exit.c	2012-10-22 21:17:48.576839664 +0200
+@@ -141,7 +141,9 @@
 		rpc_eventlog_shutdown();
 		rpc_ntsvcs_shutdown();
 		rpc_svcctl_shutdown();
@@ -222,46 +329,10 @@
 
 		rpc_srvsvc_shutdown();
 		rpc_winreg_shutdown();
--- a/source3/smbd/open.c
-+++ b/source3/smbd/open.c
-@@ -1556,6 +1556,9 @@ static NTSTATUS open_file_ntcreate(conne
- 		 * Most of the passed parameters are ignored.
- 		 */
- 
-+#ifndef PRINTER_SUPPORT
-+		return NT_STATUS_ACCESS_DENIED;
-+#endif
- 		if (pinfo) {
- 			*pinfo = FILE_WAS_CREATED;
- 		}
--- a/source3/smbd/close.c
-+++ b/source3/smbd/close.c
-@@ -638,6 +638,9 @@ static NTSTATUS close_normal_file(struct
- 	status = ntstatus_keeperror(status, tmp);
- 
- 	if (fsp->print_file) {
-+#ifndef PRINTER_SUPPORT
-+		return NT_STATUS_OK;
-+#endif
- 		/* FIXME: return spool errors */
- 		print_spool_end(fsp, close_type);
- 		file_free(req, fsp);
--- a/source3/smbd/fileio.c
-+++ b/source3/smbd/fileio.c
-@@ -298,6 +298,10 @@ ssize_t write_file(struct smb_request *r
- 		uint32_t t;
- 		int ret;
- 
-+#ifndef PRINTER_SUPPORT
-+		return -1;
-+#endif
-+
- 		ret = print_spool_write(fsp, data, n, pos, &t);
- 		if (ret) {
- 			errno = ret;
--- a/source3/smbd/smb2_create.c
-+++ b/source3/smbd/smb2_create.c
-@@ -485,7 +485,10 @@ static struct tevent_req *smbd_smb2_crea
+diff -Naur samba-3.6.8/source3/smbd/smb2_create.c samba-3.6.8.patch/source3/smbd/smb2_create.c
+--- samba-3.6.8/source3/smbd/smb2_create.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/smbd/smb2_create.c	2012-10-22 21:17:48.581839764 +0200
+@@ -485,7 +485,10 @@
 		info = FILE_WAS_OPENED;
 	} else if (CAN_PRINT(smb1req->conn)) {
 		status = file_new(smb1req, smb1req->conn, &result);
@@ -273,84 +344,17 @@
 			tevent_req_nterror(req, status);
 			return tevent_req_post(req, ev);
 		}
--- a/source3/rpc_server/svcctl/srv_svcctl_nt.c
-+++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c
-@@ -85,9 +85,11 @@ bool init_service_op_table( void )
+diff -Naur samba-3.6.8/source3/utils/net_rpc.c samba-3.6.8.patch/source3/utils/net_rpc.c
+--- samba-3.6.8/source3/utils/net_rpc.c	2012-09-14 10:12:09.000000000 +0200
+++ samba-3.6.8.patch/source3/utils/net_rpc.c	2012-10-22 21:17:48.569839523 +0200
+@@ -7791,6 +7791,10 @@
+ 		{NULL, NULL, 0, NULL, NULL}
+ 	};
 
- 	/* add builtin services */
- 
-+#ifdef PRINTER_SUPPORT
- 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" );
- 	svcctl_ops[i].ops  = &spoolss_svc_ops;
- 	i++;
-+#endif
- 
- 	svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
- 	svcctl_ops[i].ops  = &netlogon_svc_ops;
--- a/source3/librpc/rpc/rpc_common.c
-+++ b/source3/librpc/rpc/rpc_common.c
-@@ -113,9 +113,11 @@ static bool initialize_interfaces(void)
- 	if (!smb_register_ndr_interface(&ndr_table_winreg)) {
- 		return false;
- 	}
-+#ifdef PRINTER_SUPPORT
- 	if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
- 		return false;
- 	}
-+#endif
- 	if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
- 		return false;
- 	}
--- a/source3/smbd/process.c
-+++ b/source3/smbd/process.c
-@@ -2475,8 +2475,10 @@ static bool housekeeping_fn(const struct
- 
- 	change_to_root_user();
- 
-+#ifdef PRINTER_SUPPORT
- 	/* update printer queue caches if necessary */
- 	update_monitored_printq_cache(sconn->msg_ctx);
-+#endif
- 
- 	/* check if we need to reload services */
- 	check_reload(sconn, time_mono(NULL));
--- a/source3/smbd/server.c
-+++ b/source3/smbd/server.c
-@@ -126,7 +126,9 @@ static void smb_pcap_updated(struct mess
- {
- 	struct tevent_context *ev_ctx =
- 		talloc_get_type_abort(private_data, struct tevent_context);
-
 +#ifndef PRINTER_SUPPORT
-+	return;
+	return 0;
 +#endif
- 	DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
- 	change_to_root_user();
- 	reload_printers(ev_ctx, msg);
-@@ -1211,8 +1213,10 @@ extern void build_options(bool screen);
- 	if (!W_ERROR_IS_OK(registry_init_full()))
- 		exit(1);
- 
-+#ifdef PRINTER_SUPPORT
- 	if (!print_backend_init(smbd_messaging_context()))
- 		exit(1);
-+#endif
- 
- 	/* Open the share_info.tdb here, so we don't have to open
- 	   after the fork on every single connection.  This is a small
-@@ -1256,6 +1260,7 @@ extern void build_options(bool screen);
- 		exit(1);
- 	}
- 
-+#ifdef PRINTER_SUPPORT
- 	/* Publish nt printers, this requires a working winreg pipe */
- 	pcap_cache_reload(server_event_context(), smbd_messaging_context(),
- 			  &reload_printers);
-@@ -1284,6 +1289,7 @@ extern void build_options(bool screen);
- 				       smbd_messaging_context());
- 		}
- 	}
-+#endif
- 
- 	if (!is_daemon) {
- 		/* inetd mode */
+
+ 	if (argc == 0) {
+ 		if (c->display_usage) {
+ 			d_printf(_("Usage:\n"));
@@ -0,0 +1,11 @@
+--- samba-3.6.8/source3/param/loadparm.c	2012-09-14 02:12:09.000000000 -0600
+++ samba-3.6.8-b/source3/param/loadparm.c	2012-11-25 15:53:07.543125017 -0700
+@@ -5336,7 +5336,7 @@
+ 	Globals.bClientPlaintextAuth = False;	/* Do NOT use a plaintext password even if is requested by the server */
+ 	Globals.bLanmanAuth = False;	/* Do NOT use the LanMan hash, even if it is supplied */
+ 	Globals.bNTLMAuth = True;	/* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
+-	Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+	Globals.bClientNTLMv2Auth = False; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+ 	/* Note, that we will also use NTLM2 session security (which is different), if it is available */
+ 
+ 	Globals.map_to_guest = 0;	/* By Default, "Never" */
@@ -29,7 +29,7 @@ cd $PKG_BUILD/$1

 cp $ROOT/$PKG_DIR/config/makefile.config .config

-echo "CONFIG_TLS=gnutls" >> .config
-echo "CONFIG_GNUTLS_EXTRA=y" >> .config
+# echo "CONFIG_TLS=gnutls" >> .config
+# echo "CONFIG_GNUTLS_EXTRA=y" >> .config

 make V=1 LIBDIR=/usr/lib BINDIR=/usr/bin
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://hostap.epitest.fi/wpa_supplicant/"
 PKG_URL="http://hostap.epitest.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="dbus libnl gnutls"
-PKG_BUILD_DEPENDS="toolchain dbus libnl gnutls"
+PKG_DEPENDS="dbus libnl openssl"
+PKG_BUILD_DEPENDS="toolchain dbus libnl openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="wpa_supplicant: An IEEE 802.11i supplicant implementation"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="distribute"
-PKG_VERSION="0.6.28"
+PKG_VERSION="0.6.29"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -26,8 +26,12 @@
 PATH="/bin:/sbin:/usr/bin:/usr/sbin"

 # hack: add addons to $PATH
-  for i in `find /storage/.xbmc/addons/* -name bin -type d`; do
-    PATH="$PATH:$i"
+  for addons in `find /storage/.xbmc/addons/* -name bin -type d`; do
+    PATH="$PATH:$addons"
+  done
+
+  for sys in `find /usr/lib/xbmc/addons/* -name bin -type d`; do
+    PATH="$PATH:$sys"
  done

 export PATH
@@ -28,8 +28,12 @@
 LD_LIBRARY_PATH="/usr/lib:/lib"

 # hack: add addons to $LD_LIBRARY_PATH
-  for i in `find /storage/.xbmc/addons/* -name lib -type d`; do
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$i"
+  for addons in `find /storage/.xbmc/addons/* -name lib -type d`; do
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addons"
+  done
+
+  for sys in `find /usr/lib/xbmc/addons/* -name lib -type d`; do
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
  done

 export LD_LIBRARY_PATH
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="dbus"
-PKG_VERSION="1.6.4"
+PKG_VERSION="1.6.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.42.5"
+PKG_VERSION="1.42.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="fuse"
-PKG_VERSION="2.9.1"
+PKG_VERSION="2.9.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -50,10 +50,12 @@ cd $PKG_BUILD
            --disable-tcpwrap \
            --disable-pam \
            --disable-acl \
+            --disable-xattr \
            --disable-gcrypt \
            --disable-audit \
            --disable-libcryptsetup \
            --disable-qrencode \
+            --disable-microhttpd \
            --disable-binfmt \
            --disable-vconsole \
            --disable-readahead \
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="systemd"
-PKG_VERSION="194"
+PKG_VERSION="195"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="util-linux"
-PKG_VERSION="2.22"
+PKG_VERSION="2.22.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -38,7 +38,7 @@ cd .build-target
             --enable-shared \
             --disable-silent-rules \
             $CONFIG_LIBXML \
-             --disable-ipv6 \
+             --enable-ipv6 \
             --without-python \
             --with-zlib \
             --without-lzma
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="automake"
-PKG_VERSION="1.12.3"
+PKG_VERSION="1.12.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="bison"
-PKG_VERSION="2.6.2"
+PKG_VERSION="2.6.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="hdparm"
-PKG_VERSION="9.39"
+PKG_VERSION="9.42"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
@@ -55,7 +55,7 @@ ac_cv_header_librtmp_rtmp_h=yes \
            --disable-gophper \
            --disable-manual \
            --enable-libgcc \
-            --disable-ipv6 \
+            --enable-ipv6 \
            --enable-versioned-symbols \
            --enable-nonblocking \
            --enable-threaded-resolver \
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="curl"
-PKG_VERSION="7.27.0"
+PKG_VERSION="7.28.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
@@ -1,30 +0,0 @@
-From 986c7949c0638bebb99bd08d63216433254c2185 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <[email protected]>
-Date: Mon, 6 Aug 2012 15:04:25 +0200
-Subject: [PATCH] gtls: fix build failure by including nettle-specific headers
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
---
- lib/gtls.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/gtls.c b/lib/gtls.c
-index d981ef1..c750a6f 100644
--- a/lib/gtls.c
-+++ b/lib/gtls.c
-@@ -34,7 +34,10 @@
- 
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
-#ifndef USE_GNUTLS_NETTLE
-+#ifdef USE_GNUTLS_NETTLE
-+#include <gnutls/crypto.h>
-+#include <nettle/md5.h>
-+#else
- #include <gcrypt.h>
- #endif
- 
-- 
-1.7.10.4
-
@@ -1,148 +0,0 @@
-From 9f304291bd72aae66944cd7523707e1b88c6ad7b Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <[email protected]>
-Date: Mon, 6 Aug 2012 19:20:35 +0200
-Subject: [PATCH] metalink: change code order to build with gnutls-nettle
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
---
- src/tool_metalink.c |  116 +++++++++++++++++++++++++--------------------------
- 1 file changed, 58 insertions(+), 58 deletions(-)
-
-diff --git a/src/tool_metalink.c b/src/tool_metalink.c
-index 5491815..3a24a15 100644
--- a/src/tool_metalink.c
-+++ b/src/tool_metalink.c
-@@ -82,64 +82,6 @@
-     return PARAM_NO_MEM; \
- } WHILE_FALSE
- 
-const digest_params MD5_DIGEST_PARAMS[] = {
-  {
-    (Curl_digest_init_func) MD5_Init,
-    (Curl_digest_update_func) MD5_Update,
-    (Curl_digest_final_func) MD5_Final,
-    sizeof(MD5_CTX),
-    16
-  }
-};
-
-const digest_params SHA1_DIGEST_PARAMS[] = {
-  {
-    (Curl_digest_init_func) SHA1_Init,
-    (Curl_digest_update_func) SHA1_Update,
-    (Curl_digest_final_func) SHA1_Final,
-    sizeof(SHA_CTX),
-    20
-  }
-};
-
-const digest_params SHA256_DIGEST_PARAMS[] = {
-  {
-    (Curl_digest_init_func) SHA256_Init,
-    (Curl_digest_update_func) SHA256_Update,
-    (Curl_digest_final_func) SHA256_Final,
-    sizeof(SHA256_CTX),
-    32
-  }
-};
-
-static const metalink_digest_def SHA256_DIGEST_DEF[] = {
-  {"sha-256", SHA256_DIGEST_PARAMS}
-};
-
-static const metalink_digest_def SHA1_DIGEST_DEF[] = {
-  {"sha-1", SHA1_DIGEST_PARAMS}
-};
-
-static const metalink_digest_def MD5_DIGEST_DEF[] = {
-  {"md5", MD5_DIGEST_PARAMS}
-};
-
-/*
- * The alias of supported hash functions in the order by preference
- * (basically stronger hash comes first). We included "sha-256" and
- * "sha256". The former is the name defined in the IANA registry named
- * "Hash Function Textual Names". The latter is widely (and
- * historically) used in Metalink version 3.
- */
-static const metalink_digest_alias digest_aliases[] = {
-  {"sha-256", SHA256_DIGEST_DEF},
-  {"sha256", SHA256_DIGEST_DEF},
-  {"sha-1", SHA1_DIGEST_DEF},
-  {"sha1", SHA1_DIGEST_DEF},
-  {"md5", MD5_DIGEST_DEF},
-  {NULL, NULL}
-};
-
- #ifdef USE_GNUTLS_NETTLE
- 
- static void MD5_Init(MD5_CTX *ctx)
-@@ -251,6 +193,64 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
- 
- #endif /* CRYPTO LIBS */
- 
-+const digest_params MD5_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) MD5_Init,
-+    (Curl_digest_update_func) MD5_Update,
-+    (Curl_digest_final_func) MD5_Final,
-+    sizeof(MD5_CTX),
-+    16
-+  }
-+};
-+
-+const digest_params SHA1_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA1_Init,
-+    (Curl_digest_update_func) SHA1_Update,
-+    (Curl_digest_final_func) SHA1_Final,
-+    sizeof(SHA_CTX),
-+    20
-+  }
-+};
-+
-+const digest_params SHA256_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA256_Init,
-+    (Curl_digest_update_func) SHA256_Update,
-+    (Curl_digest_final_func) SHA256_Final,
-+    sizeof(SHA256_CTX),
-+    32
-+  }
-+};
-+
-+static const metalink_digest_def SHA256_DIGEST_DEF[] = {
-+  {"sha-256", SHA256_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def SHA1_DIGEST_DEF[] = {
-+  {"sha-1", SHA1_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def MD5_DIGEST_DEF[] = {
-+  {"md5", MD5_DIGEST_PARAMS}
-+};
-+
-+/*
-+ * The alias of supported hash functions in the order by preference
-+ * (basically stronger hash comes first). We included "sha-256" and
-+ * "sha256". The former is the name defined in the IANA registry named
-+ * "Hash Function Textual Names". The latter is widely (and
-+ * historically) used in Metalink version 3.
-+ */
-+static const metalink_digest_alias digest_aliases[] = {
-+  {"sha-256", SHA256_DIGEST_DEF},
-+  {"sha256", SHA256_DIGEST_DEF},
-+  {"sha-1", SHA1_DIGEST_DEF},
-+  {"sha1", SHA1_DIGEST_DEF},
-+  {"md5", MD5_DIGEST_DEF},
-+  {NULL, NULL}
-+};
-+
- digest_context *Curl_digest_init(const digest_params *dparams)
- {
-   digest_context *ctxt;
-- 
-1.7.10.4
-
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.6"
+PKG_VERSION="2.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.20.9"
+PKG_VERSION="2.20.12"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="295.71"
+PKG_VERSION="304.60"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libxcb"
-PKG_VERSION="1.8.1"
+PKG_VERSION="1.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xcb-proto"
-PKG_VERSION="1.7.1"
+PKG_VERSION="1.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -121,7 +121,7 @@ cd $PKG_BUILD
            --with-int10=x86emu \
            --disable-ipv6 \
            --with-gnu-ld \
-            --with-sha1=libgcrypt \
+            --with-sha1=libcrypto \
            --with-os-vendor="OpenELEC.tv" \
            --with-module-dir=$XORG_PATH_MODULES \
            --with-xkb-path=$XORG_PATH_XKB \
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libpciaccess libX11 libXfont libdrm libgcrypt freetype pixman systemd"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm libgcrypt freetype pixman fontsproto systemd"
+PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.30 Kernel Configuration
+# Linux/i386 3.2.31 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -579,7 +579,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -590,7 +590,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -633,6 +652,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1732,7 +1763,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -580,7 +580,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -591,7 +591,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -634,6 +653,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -896,7 +927,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -2027,7 +2058,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -540,7 +540,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -551,7 +551,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -594,6 +613,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -857,7 +888,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -1976,7 +2007,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -584,7 +584,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -595,7 +595,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -638,6 +657,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -908,7 +939,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -2108,7 +2139,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -584,7 +584,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -595,7 +595,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -638,6 +657,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -908,7 +939,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -2106,7 +2137,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -580,7 +580,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -591,7 +591,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -634,6 +653,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -904,7 +935,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -1985,7 +2016,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -529,7 +529,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -540,7 +540,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -583,6 +602,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -854,7 +885,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -1923,7 +1954,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -582,7 +582,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -593,7 +593,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -636,6 +655,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -906,7 +937,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -2022,7 +2053,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -532,7 +532,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -543,7 +543,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -586,6 +605,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -857,7 +888,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCSI_ISCSI_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
-# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
@@ -1961,7 +1992,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.30 Kernel Configuration
+# Linux/arm 3.2.31 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -466,7 +466,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -476,7 +476,26 @@ CONFIG_SYN_COOKIES=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NETFILTER is not set
@@ -1359,7 +1378,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.30 Kernel Configuration
+# Linux/x86_64 3.2.31 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -529,7 +529,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -540,7 +540,26 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
@@ -583,6 +602,18 @@ CONFIG_IP_NF_FILTER=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV6 is not set
+CONFIG_IP6_NF_IPTABLES=y
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_FILTER=y
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1816,7 +1847,7 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_VP7045=m
 # CONFIG_DVB_USB_VP702X is not set
 # CONFIG_DVB_USB_GP8PSK is not set
-# CONFIG_DVB_USB_NOVA_T_USB2 is not set
+CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_DTT200U=m
 # CONFIG_DVB_USB_OPERA1 is not set
Author	SHA1	Message	Date
Stephan Raue	0954de0a6d	Merge pull request #1506 from ismell/bug_947 Fixes #947	2012-11-26 09:34:40 -08:00
Raul E Rangel	26f9677b59	Fixes #947 When upgrading to samba 3.6.x they changed the default for NTLMv2 auth from false to true. This causes xbmc to fail to connec to OpenSolaris based distros like Nexenta or IllumOS which use the native in kernel CIFS server. This patch resets the default back to false.	2012-11-25 16:28:33 -07:00
Stephan Raue	4d32ae4440	curl: enable ipv6 support Signed-off-by: Stephan Raue <[email protected]>	2012-10-27 15:20:58 +02:00
Stephan Raue	63a5e78b7f	libxml2: enable ipv6 support Signed-off-by: Stephan Raue <[email protected]>	2012-10-27 15:20:45 +02:00
Stephan Raue	903f2ab8da	ntp: enable ipv6 support Signed-off-by: Stephan Raue <[email protected]>	2012-10-27 15:20:28 +02:00
Stephan Raue	fc72cdcbee	projects/*/linux: reenable IPv6 support, this reverts `7d80f29835`, this fixes #1262 Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 20:06:25 +02:00
Stephan Raue	2ec39313ec	libtirpc: update upstream patches Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:04:54 +02:00
Stephan Raue	33ae06cfcb	projects/*/linux: add SAS-ATA support to supported builds Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:04:27 +02:00
Stephan Raue	1a6bdb81a1	Mesa: update to Mesa-8.0.5 Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:04:07 +02:00
root	2b29432ee6	Revert "xorg-server: build with libgcrypt support" This reverts commit `25192040ab`.	2012-10-26 13:03:49 +02:00
root	ea911a19c5	Revert "wpa_supplicant: build with gnutls support" This reverts commit `a71720e33f`.	2012-10-26 13:03:31 +02:00
Stephan Raue	39a3d8a896	fuse: update to fuse-2.9.2 Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:03:11 +02:00
Stefan Saraev	8ef98bbc79	tvheadend: handle upgrade	2012-10-26 13:02:54 +02:00
Stephan Raue	84b73abf98	tvheadend: cleanup any hts-tvheadend dir Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:02:37 +02:00
Stephan Raue	217102c9c1	hts-tvheadend: rename to tvheadend, update to tvheadend-3.2, add version string to addon summary, thanks to Gujs! this fixes #1304 Signed-off-by: Stephan Raue <[email protected]>	2012-10-26 13:02:17 +02:00
Stephan Raue	0e264b597e	projects/*/linux: enable DVB Kernel config: CONFIG_DVB_USB_NOVA_T_USB2=m Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:20:55 +02:00
Stephan Raue	aecf929429	bison: update to bison-2.6.3 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:12:06 +02:00
Stephan Raue	68760a3484	iptables: update to iptables-1.4.16.3 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:11:49 +02:00
Stephan Raue	33eb2da9a3	systemd: update to systemd-195 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:11:30 +02:00
Stephan Raue	7f8725b14f	distribute: update to distribute-0.6.29 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:11:13 +02:00
Stephan Raue	919e734b91	libass: update to libass-0.10.1 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:10:53 +02:00
Stephan Raue	bb43a0d6e7	glib: update to glib-2.34.1 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:10:33 +02:00
Stephan Raue	bb95760e53	samba: update to samba-3.6.8 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:10:02 +02:00
Stephan Raue	3005052a4a	xf86-video-intel: update to xf86-video-intel-2.20.12 Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 16:09:42 +02:00
Stephan Raue	19f160f0e5	hts-tvheadend: add support to install as system addon Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 15:28:17 +02:00
Stephan Raue	86722250a8	busybox: add local addons to $LD_LIBRARY_PATH Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 15:26:31 +02:00
Stephan Raue	ebe9ada984	bash: add local addons to $PATH Signed-off-by: Stephan Raue <[email protected]>	2012-10-23 15:26:08 +02:00
Stephan Raue	48827e8fb4	xf86-video-nvidia: update to xf86-video-nvidia-304.60 Signed-off-by: Stephan Raue <[email protected]>	2012-10-22 15:40:38 +02:00
Stephan Raue	ffe60945ce	Revert "connman: update to connman-1.8" This reverts commit `ea419b01bf`.	2012-10-22 15:38:24 +02:00
Stephan Raue	7e8a68e729	hdparm: update to hdparm-9.42 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:12:16 +02:00
Stephan Raue	41246e7ff8	ethtool: update to ethtool-3.6 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:11:58 +02:00
Stephan Raue	0b467f0b88	xcb-proto: update to xcb-proto-1.8 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:11:42 +02:00
Stephan Raue	eca11ac298	libxcb: update to libxcb-1.9 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:11:26 +02:00
Stephan Raue	a5d0f18f95	xf86-video-intel: update to xf86-video-intel-2.20.10 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:11:09 +02:00
Stephan Raue	e1e881508e	xkeyboard-config: update to xkeyboard-config-2.7 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:10:52 +02:00
Stephan Raue	feb8619b68	automake: update to automake-1.12.4 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:10:37 +02:00
Stephan Raue	6bcd798600	curl: update to curl-7.28.0 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:10:18 +02:00
Stephan Raue	ea419b01bf	connman: update to connman-1.8 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:10:00 +02:00
Stephan Raue	af0c332123	util-linux: update to util-linux-2.22.1 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:09:44 +02:00
Stephan Raue	0fc39dd83b	e2fsprogs: update to e2fsprogs-1.42.6 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:09:26 +02:00
Stephan Raue	9ed02c25e0	dbus: update to dbus-1.6.8 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:09:10 +02:00
Stephan Raue	b5f7a8aa75	libpng: update to libpng-1.5.13 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:08:51 +02:00
Stephan Raue	d4aa9a0c2a	tiff: update to tiff-4.0.3 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:08:32 +02:00
Stephan Raue	1e35b9e765	sqlite: update to sqlite-autoconf-3071401 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:08:14 +02:00
Stephan Raue	caa9788b4a	glib: update to glib-2.34.0 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:07:52 +02:00
Stephan Raue	15e4374d2c	mysql: update to mysql-5.1.66 Signed-off-by: Stephan Raue <[email protected]>	2012-10-20 22:07:24 +02:00
Stephan Raue	8ff6289f41	config/version: set back to 'devel' Signed-off-by: Stephan Raue <[email protected]>	2012-10-18 23:34:47 +02:00
Stephan Raue	a65f19c61a	config/version: set version to 2.0.0 (2.0 final) Signed-off-by: Stephan Raue <[email protected]>	2012-10-16 20:23:12 +02:00
Stephan Raue	b7d12c3aee	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-16 02:28:19 +02:00
Stephan Raue	2465336236	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-15 18:57:53 +02:00
Stephan Raue	8799eebba3	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-15 12:47:59 +02:00
Stephan Raue	6efe60d1a7	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-15 12:19:37 +02:00
Stephan Raue	75f40dd98d	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-13 16:08:56 +02:00
Stephan Raue	650c8af746	config/version: set version to 1.99.2 (2.0 RC-2) Signed-off-by: Stephan Raue <[email protected]>	2012-10-11 21:57:43 +02:00
Stephan Raue	9b7b54eee3	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-11 19:41:47 +02:00
Stephan Raue	cf5ff8e22c	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-09 23:40:35 +02:00
Stephan Raue	04d2366e5f	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-09 19:33:36 +02:00
Stephan Raue	1ec0df8f31	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-09 09:31:17 +02:00
Stephan Raue	ee26b940bc	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-07 13:48:53 +02:00
Stephan Raue	e74553b693	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-07 13:33:29 +02:00
Stephan Raue	2bce8b1d55	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-07 11:51:15 +02:00
Stephan Raue	7f4287d7e1	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-07 06:59:52 +02:00
Stephan Raue	28233d05de	config/version: set version to 1.99.1 (2.0 RC-1) Signed-off-by: Stephan Raue <[email protected]>	2012-10-04 09:53:38 +02:00
Stephan Raue	ffcf0932d1	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-04 05:59:13 +02:00
Stephan Raue	8bef2c4618	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-10-03 19:15:17 +02:00
Stephan Raue	65f1e6ef17	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-09-30 23:18:21 +02:00
Stephan Raue	e3e3b399a6	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-09-29 03:20:20 +02:00
Stephan Raue	840d1c1284	config/version: set version to 1.95.7 (2.0 beta-7) Signed-off-by: Stephan Raue <[email protected]>	2012-08-23 12:15:35 +02:00
Stephan Raue	2205a0cc70	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-08-22 13:34:55 +02:00
Stephan Raue	1053ab41fc	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-08-18 21:23:59 +02:00
Stephan Raue	1b8c952755	config/version: set version to 1.95.6 (2.0 beta-6) Signed-off-by: Stephan Raue <[email protected]>	2012-08-13 03:14:36 +02:00
Stephan Raue	455a885659	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-08-12 00:11:55 +02:00
Stephan Raue	30adf74c6f	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-08-08 19:50:45 +02:00
Stephan Raue	4b002340ef	config/version: set version to 1.95.5 (2.0 beta-5) Signed-off-by: Stephan Raue <[email protected]>	2012-07-06 20:15:57 +02:00
Stephan Raue	eb69d5242b	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-07-06 20:14:25 +02:00
Stephan Raue	beeda52e13	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-07-04 00:08:50 +02:00
Stephan Raue	d8e0b6a5f4	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-07-01 20:36:23 +02:00
Stephan Raue	50ea62c4e7	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-06-30 23:26:25 +02:00
Stephan Raue	d1b622a377	config/version: set version to 1.95.4 (2.0 beta-4) Signed-off-by: Stephan Raue <[email protected]>	2012-05-19 14:43:37 +02:00
Stephan Raue	93046a114a	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-05-19 04:14:22 +02:00
Stephan Raue	a5c68715c9	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-05-17 00:06:33 +02:00
Stephan Raue	dd730bb6c9	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-05-15 17:25:59 +02:00
Stephan Raue	9d129da158	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-05-14 18:59:02 +02:00
Stephan Raue	9a9c3bf4e5	config/version: set version to 1.95.3 (2.0 beta-3) Signed-off-by: Stephan Raue <[email protected]>	2012-05-01 20:13:52 +02:00
Stephan Raue	ce8de06704	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-05-01 20:12:46 +02:00
Stephan Raue	55d90453a9	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-30 02:54:02 +02:00
Stephan Raue	5e92f1ce82	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-28 16:10:55 +02:00
Stephan Raue	400cdf4a67	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-21 23:42:28 +02:00
Stephan Raue	3cf3adae18	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-20 18:14:40 +02:00
Stephan Raue	7c67563f26	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-20 13:11:39 +02:00
Stephan Raue	e9ec1ebeb9	VERSION set version to 1.95.2 (2.0 beta-2) Signed-off-by: Stephan Raue <[email protected]>	2012-04-20 02:59:30 +02:00
Stephan Raue	58631c27ec	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-20 01:57:03 +02:00
Stephan Raue	d2fd2e102a	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-18 17:17:22 +02:00
Stephan Raue	59e12c8f69	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-14 15:07:37 +02:00
Stephan Raue	94327fdf85	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-14 14:28:52 +02:00
Stephan Raue	7e75a7a7a7	config/version: set version to 1.95.1 (2.0 beta 1) Signed-off-by: Stephan Raue <[email protected]>	2012-04-07 23:19:01 +02:00
Stephan Raue	2a65bc7b74	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-07 16:31:59 +02:00
Stephan Raue	243fb0d01e	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-06 00:54:56 +02:00
Stephan Raue	ef63dab7e0	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-04 05:35:07 +02:00
Stephan Raue	08f7eb0208	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-04 01:03:17 +02:00
Stephan Raue	79168baf4d	config/version: set to 1.95.0 (beta-test) Signed-off-by: Stephan Raue <[email protected]>	2012-04-03 07:02:40 +02:00
Stephan Raue	6a4245773b	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-03 04:27:42 +02:00
Stephan Raue	5f2f48b74b	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-04-02 14:51:36 +02:00
Stephan Raue	a00fde001b	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0 Conflicts: VERSION	2012-03-27 05:39:41 +02:00
Stephan Raue	eae49e55da	VERSION set version to 1.95.1 (2.0 beta-1) Signed-off-by: Stephan Raue <[email protected]>	2012-02-13 16:54:14 +01:00
Stephan Raue	8542402602	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-02-13 16:43:11 +01:00
Stephan Raue	07d4312595	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-02-12 17:12:39 +01:00
Stephan Raue	e4edcc2894	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2012-02-12 02:24:00 +01:00
Stephan Raue	bf590a1424	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2011-12-18 18:12:59 +01:00
Stephan Raue	c17df4dc19	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2011-12-17 17:51:04 +01:00
Stephan Raue	4d581777cf	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2011-12-11 02:00:45 +01:00
Stephan Raue	84df6b8edd	Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-2.0	2011-12-09 11:53:11 +01:00
Stephan Raue	bc750c2494	VERSION set version to 1.90.1 (2.0 alpha-1) Signed-off-by: Stephan Raue <[email protected]>	2011-12-07 19:11:23 +01:00