---
 lib/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

Index: libnl-2.0/lib/Makefile.am
===================================================================
--- libnl-2.0.orig/lib/Makefile.am
+++ libnl-2.0/lib/Makefile.am
@@ -27,11 +27,15 @@ CLEANFILES = \
 	route/pktloc_grammar.c route/pktloc_grammar.h \
 	route/pktloc_syntax.c route/pktloc_syntax.h

+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
+
 # Hack to avoid using ylwrap. It does not function correctly in combination
 # with --header-file=
-route/pktloc_grammar.c: route/pktloc_grammar.l
+route/pktloc_grammar.h: route/pktloc_grammar.c
+route/pktloc_grammar.c: route/pktloc_grammar.y
 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^

+route/pktloc_syntax.h: route/pktloc_syntax.c
 route/pktloc_syntax.c: route/pktloc_syntax.y
 	$(YACC) -d $(YFLAGS) -o $@ $^

Index: libnl-2.0/lib/Makefile.am
===================================================================
--- libnl-2.0.orig/lib/Makefile.am
+++ libnl-2.0/lib/Makefile.am
@@ -27,11 +27,15 @@ CLEANFILES = \
 	route/pktloc_grammar.c route/pktloc_grammar.h \
 	route/pktloc_syntax.c route/pktloc_syntax.h

+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
+
 # Hack to avoid using ylwrap. It does not function correctly in combination
 # with --header-file=
+route/pktloc_grammar.h: route/pktloc_grammar.c
 route/pktloc_grammar.c: route/pktloc_grammar.l
 	$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^

+route/pktloc_syntax.h: route/pktloc_syntax.c
 route/pktloc_syntax.c: route/pktloc_syntax.y
 	$(YACC) -d $(YFLAGS) -o $@ $^

Fix thinko in last patch

libnl2: Fix thinko in last patch

Signed-off-by: Tom Rini <4c3d5c8f8c21c27dd329bd585f481113514551fd@mentor.com>


diff --git a/Makefile b/Makefile
index 0c6b44f..9c9f5b0 100644
--- a/Makefile
+++ b/Makefile
@@ -117,5 +117,3 @@ deploy@prod:
 ##########
 # Custom #
 ##########
-
- This line is expected in the patch
\ No newline at end of file
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
new file mode 100644
index 0000000..9ab9e15
--- /dev/null
+++ b/ansible/deploy.yml
@@ -0,0 +1,6 @@
+---
+
+- hosts: deploy
+  gather_facts: false
+  roles:
+    - manala.deploy

diff --git a/Makefile b/Makefile
index 0c6b44f..9c9f5b0 100644
--- a/Makefile
+++ b/Makefile
@@ -117,5 +117,3 @@ deploy@prod:
 ##########
 # Custom #
 ##########
-
- This line is expected in the patch
\ No newline at end of file
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
new file mode 100644
index 0000000..1311a67
--- /dev/null
+++ b/ansible/deploy.yml
@@ -0,0 +1,6 @@
+---
+
+- hosts: deploy
+  any_errors_fatal: true
+  roles:
+    - manala.deploy

Fix test after adding any_errors_fatal deploy key


--- ./configure.ac.old	2013-09-13 09:15:32.473365627 -0300
+++ ./configure.ac	2013-09-13 13:27:06.829711487 -0300
@@ -392,7 +392,7 @@
 dnl Check for atomic operations support in the compiler
 dnl
 AC_MSG_CHECKING([for GNU atomic operations support])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     int n = 0;
 ]],[[
     __sync_add_and_fetch(&n, 10); // n becomes 10

--- ./configure.ac.old	2013-09-13 09:15:32.473365627 -0300
+++ ./configure.ac	2013-09-13 13:27:06.829711487 -0300
@@ -415,7 +415,7 @@
 dnl Check for atomic operations support in the compiler
 dnl
 AC_MSG_CHECKING([for GNU atomic operations support])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     int n = 0;
 ]],[[
     __sync_add_and_fetch(&n, 10); // n becomes 10

Update path for new version

Update path for new version


diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 269ae18..d212daa 100755
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -205,14 +205,18 @@
 #define CONFIG_SPL_I2C_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
+/*
 #define CONFIG_SPL_YMODEM_SUPPORT
+*/
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"

 /* NAND boot config */
 #ifndef CONFIG_SPI_BOOT
+/*
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_NAND_SUPPORT
+*/
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 269ae18..d212daa 100755
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -226,19 +230,11 @@
 #define CONFIG_SPL_I2C_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_POWER_SUPPORT
-#define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL"
-#define CONFIG_SPL_ETH_SUPPORT
-#define CONFIG_SPL_MUSB_GADGET_SUPPORT
-#define CONFIG_SPL_USB_ETH_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"

 /* NAND boot config */
 #ifndef CONFIG_SPI_BOOT
-#define CONFIG_SPL_NAND_SIMPLE
-#define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
 					 CONFIG_SYS_NAND_PAGE_SIZE)

Update this patch to work against the most recent TI U-Boot sources.


Allow BusyBox to be invoked as "<something>-busybox". This is
necessary when it's run from the Nix store as <hash>-busybox during
stdenv bootstrap.
--- busybox-1.26.1-orig/libbb/appletlib.orig	2016-10-26 19:54:20.510957575 -0400
+++ busybox-1.26.1/libbb/appletlib.c	2016-10-26 19:48:31.590862853 -0400
@@ -887,7 +887,7 @@
 static NORETURN void run_applet_and_exit(const char *name, char **argv)
 {
 #  if ENABLE_BUSYBOX
-	if (is_prefixed_with(name, "busybox"))
+	if (strstr(name, "busybox") != 0)
 		exit(busybox_main(argv));
 #  endif
 #  if NUM_APPLETS > 0
@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv)

 	lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
 # if !ENABLE_BUSYBOX
-	if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
+	if (argv[1] && strstr(bb_basename(argv[0]), "busybox") != 0)
 		argv++;
 # endif
 	applet_name = argv[0];

Fix in-store invocation of busybox

busybox: Fix in-store invocation of busybox

This fixes the usage for stdenv bootstrap.

Additionally, dezgeg ported the patch from 1.25.1 to 1.26.1


--- ../src_base/common/net/minecraft/src/ItemBucket.java
+++ ../src_work/common/net/minecraft/src/ItemBucket.java
@@ -1,4 +1,7 @@
 package net.minecraft.src;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.FillBucketEvent;

 public class ItemBucket extends Item
 {
@@ -31,6 +34,17 @@
         }
         else
         {
+            FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, var12);
+            if (MinecraftForge.EVENT_BUS.post(event))
+            {
+                return par1ItemStack;
+            }
+
+            if (event.isHandeled())
+            {
+                return event.result;
+            }
+
             if (var12.typeOfHit == EnumMovingObjectType.TILE)
             {
                 int var13 = var12.blockX;

--- ../src_base/common/net/minecraft/src/ItemBucket.java
+++ ../src_work/common/net/minecraft/src/ItemBucket.java
@@ -1,4 +1,7 @@
 package net.minecraft.src;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.FillBucketEvent;

 public class ItemBucket extends Item
 {
@@ -31,6 +34,32 @@
         }
         else
         {
+            FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, var12);
+            if (MinecraftForge.EVENT_BUS.post(event))
+            {
+                return par1ItemStack;
+            }
+
+            if (event.isHandeled())
+            {
+                if (par3EntityPlayer.capabilities.isCreativeMode)
+                {
+                    return par1ItemStack;
+                }
+
+                if (--par1ItemStack.stackSize <= 0)
+                {
+                    return event.result;
+                }
+
+                if (!par3EntityPlayer.inventory.addItemStackToInventory(event.result))
+                {
+                    par3EntityPlayer.dropPlayerItem(event.result);
+                }
+
+                return par1ItemStack;
+            }
+
             if (var12.typeOfHit == EnumMovingObjectType.TILE)
             {
                 int var13 = var12.blockX;

Fix FillBucketEvent to work with stacked buckets. New change in 1.3


--- src/drivers/npm/node_modules/zombie/lib/document.js	2018-04-20 14:36:04.097829977 +1000
+++ src/drivers/npm/node_modules/zombie/lib/document.js	2018-04-20 14:34:25.699317000 +1000
@@ -281,7 +281,7 @@
       // The current window, postMessage and window.close need this
       browser._windowInScope = window;
       var result = undefined;
-      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename });else if (code) result = code.call(window);
+      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename, timeout: 1000 });else if (code) result = code.call(window);
       browser.emit('evaluated', code, result, filename);
       return result;
     } catch (error) {

--- src/drivers/npm/node_modules/zombie/lib/document.js
+++ src/drivers/npm/node_modules/zombie/lib/document.js
@@ -247,7 +247,7 @@ function setupWindow(window, args) {
       browser._windowInScope = window;
       let result;
       if (typeof code == 'buffer' || code instanceof Buffer) code = code.toString();
-      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, context, { filename });else if (code) result = code.call(window);
+      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, context, { filename, timeout: 1000 });else if (code) result = code.call(window);
       browser.emit('evaluated', code, result, filename);
       return result;
     } catch (error) {

Fix patch file against Zombie 6.1.2

Fix patch file against Zombie 6.1.2

fixes #2707


Add libcrypt32 to OpenDCP libraries for linking


From 33150de2d77ffb645da1a043933b12ddc0143cea Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 21 Mar 2017 18:59:03 -0700
Subject: [PATCH] include sys/select.h for fd_* definitions

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 utils/ndptool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/ndptool.c b/utils/ndptool.c
index 1d96f4c..0fd4c4d 100644
--- a/utils/ndptool.c
+++ b/utils/ndptool.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <signal.h>
 #include <getopt.h>
+#include <sys/select.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
--
2.12.0

From 94e9a082d76414f82794b0c9817d0c24e3868275 Mon Sep 17 00:00:00 2001
From: Kylie McClain <somasis@exherbo.org>
Date: Sat, 21 May 2016 21:24:36 -0400
Subject: [PATCH] ndptool: Fix compilation on musl libc

FD_ZERO, fd_set, etc are defined within sys/select.h on musl.

Signed-off-by: Kylie McClain <somasis@exherbo.org>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 utils/ndptool.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/ndptool.c b/utils/ndptool.c
index 1d96f4c..96479fa 100644
--- a/utils/ndptool.c
+++ b/utils/ndptool.c
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <ndp.h>
+#include <sys/select.h>

 enum verbosity_level {
 	VERB1,

Update patch with upstream version.

libndp: Update patch with upstream version.

Signed-off-by: Gianfranco Costamagna <7d65a1a301a498b7f4c0f3f95edb991bc7b8c127@abinsula.com>
Signed-off-by: Martin Jansa <516df3ff67e1fa5d153800b15fb204c0a1a389dc@gmail.com>


From 2797b1709a6a7a0d0cfd4b124f45dbbb26790cde Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Thu, 25 Jun 2015 15:51:59 +0200
Subject: [PATCH 50/60] browser: disable profile auto-import on first run

---
 chrome/browser/chrome_browser_main.cc | 1 +
 1 file changed, 1 insertion(+)

--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1663,8 +1663,6 @@ int ChromeBrowserMainParts::PreMainMessa
   // and preferences have been registered since some of the import code depends
   // on preferences.
   if (first_run::IsChromeFirstRun()) {
-    first_run::AutoImport(profile_, master_prefs_->import_bookmarks_path);
-
     // Note: this can pop the first run consent dialog on linux.
     first_run::DoPostImportTasks(profile_,
                                  master_prefs_->make_chrome_default_for_user);

Fix refresh of Iridium disable auto-importing patch


This patch disable GC-sensitive tests.  This is particularly useful when
compiling with `-O0' (as is done with coverage analysis) since there may
be many false references held on the stack, leading to the failure of
such tests.

--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -366,6 +366,7 @@
 	    (not (mutex-owner m))))

         (pass-if "mutex with owner not retained (bug #27450)"
+          (throw 'unresolved)
           (let ((g (make-guardian)))
             (g (let ((m (make-mutex))) (lock-mutex m) m))

This patch disable GC-sensitive tests.  This is particularly useful when
compiling with `-O0' (as is done with coverage analysis) since there may
be many false references held on the stack, leading to the failure of
such tests.

--- a/test-suite/tests/gc.test
+++ b/test-suite/tests/gc.test
@@ -67,6 +67,7 @@

 (with-test-prefix "gc"
   (pass-if "Unused modules are removed"
+    (throw 'unresolved)
     (let* ((guard (make-guardian))
            (total 1000))

--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -366,6 +366,7 @@
 	    (not (mutex-owner m))))

         (pass-if "mutex with owner not retained (bug #27450)"
+          (throw 'unresolved)
           (let ((g (make-guardian)))
             (g (let ((m (make-mutex))) (lock-mutex m) m))

Guile: Disable more GC-sensitive tests when using `-O0'.

svn path=/nixpkgs/trunk/; revision=29854


Index: webkit/browser/dom_storage/dom_storage_host.h
===================================================================
--- webkit/browser/dom_storage/dom_storage_host.h	(revision 194718)
+++ webkit/browser/dom_storage/dom_storage_host.h	(working copy)
@@ -65,6 +65,8 @@

   scoped_refptr<DomStorageContext> context_;
   AreaMap connections_;
+
+  DISALLOW_COPY_AND_ASSIGN(DomStorageHost);
 };

 }  // namespace dom_storage

Index: content/browser/dom_storage/dom_storage_host.h
===================================================================
--- content/browser/dom_storage/dom_storage_host.h	(revision 194718)
+++ content/browser/dom_storage/dom_storage_host.h	(working copy)
@@ -65,6 +65,8 @@

   scoped_refptr<DOMStorageContextImpl> context_;
   AreaMap connections_;
+
+  DISALLOW_COPY_AND_ASSIGN(DOMStorageHost);
 };

 }  // namespace content

Update DOMStorageHost patch for Chrome 30

This class was moved to content/browser/dom_storage and renamed in
http://src.chromium.org/viewvc/chrome?view=revision&revision=216211.


# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

# Sonarlint plugin
.idea/sonarlint

# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/*

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

# Sonarlint plugin
.idea/sonarlint

Add asterisk to enable exclusion of custom/specific files inside .idea directory

Withouth askterisk one cannot exclude folders like ".idea/runConfigurations" from gitignore. Checking shared run configurations into repo is a common practice for many teams. With asterisk folders like these can be easily excluded in the "### Custom declarations ###" section located at the end of the generated .gitignore. Detailed discussion: https://gist.github.com/hieblmedia/9318457

Example:

### Intellij+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/*

...

### Custom declarations ###

# Share run configurations
!/.idea/runConfigurations/


diff --git a/setup.cfg b/setup.cfg
index 1065384..fc3f6b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,7 @@ remote_data_strict = True

 [ah_bootstrap]
 auto_use = True
+auto_upgrade = False

 [metadata]
 package_name = sbpy

diff --git a/setup.cfg b/setup.cfg
index 1065384..6a49338 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,11 +21,12 @@ remote_data_strict = True

 [ah_bootstrap]
 auto_use = True
+offline = True

 [metadata]
 package_name = sbpy
 description = A Python Module for Small-Body Planetary Astronomy
-long_description =
+long_description =
 author = sbpy team
 author_email = msk@astro.umd.edu
 license = BSD 3-Clause
@@ -62,8 +63,3 @@ ignore = E402,E741,E226,E501
 # Excluding files that are directly copied from the package template or
 # generated
 exclude = _astropy_init.py,version.py,ah_bootstrap.py
-
-
-[entry_points]
-
-astropy-package-template-example = packagename.example_mod:main

Patch out extraneous entry point

Patch out extraneous entry point


diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
index ada33bf..fe5dd2e 100644
--- a/profiles/apparmor/template.go
+++ b/profiles/apparmor/template.go
@@ -42,5 +42,8 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   ptrace (trace,read) peer=docker-default,
 {{end}}
+
+  # Ubuntu Snappy 15.04 tweaks
+  signal (receive) peer="docker_docker{,-daemon}_*",
 }
 `

diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
index ada33bf..001eace 100644
--- a/profiles/apparmor/template.go
+++ b/profiles/apparmor/template.go
@@ -42,5 +42,9 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   ptrace (trace,read) peer=docker-default,
 {{end}}
+
+  # Ubuntu Snappy 15.04 tweaks
+  ptrace (readby, tracedby) peer="docker_docker{,-daemon}_*",
+  signal (receive) peer="docker_docker{,-daemon}_*",
 }
 `

Add "ptrace tracedby" for the Docker daemon in Snappy 15.04


diff --git a/build.xml b/build.xml
index 186b666..11a98b6 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,12 @@
          <!--<sysproperty key="clojure.compiler.disable-locals-clearing" value="true"/>-->
       <!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
       <sysproperty key="java.awt.headless" value="true"/>
+      <!-- Found these options in the instructions for JITwatch, here: -->
+      <!-- https://github.com/AdoptOpenJDK/jitwatch/wiki/Instructions -->
+      <!-- <jvmarg value="-XX:+UnlockDiagnosticVMOptions"/> -->
+      <!-- <jvmarg value="-XX:+TraceClassLoading"/> -->
+      <!-- <jvmarg value="-XX:+LogCompilation"/> -->
+      <!-- <jvmarg value="-XX:+PrintAssembly"/> -->
       <arg value="clojure.core"/>
       <arg value="clojure.core.protocols"/>
       <arg value="clojure.main"/>

diff --git a/build.xml b/build.xml
index 186b666..df98bdb 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,12 @@
          <!--<sysproperty key="clojure.compiler.disable-locals-clearing" value="true"/>-->
       <!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
       <sysproperty key="java.awt.headless" value="true"/>
+      <!-- Found these options in the instructions for JITwatch, here: -->
+      <!-- https://github.com/AdoptOpenJDK/jitwatch/wiki/Instructions -->
+      <jvmarg value="-XX:+UnlockDiagnosticVMOptions"/>
+      <jvmarg value="-XX:+TraceClassLoading"/>
+      <jvmarg value="-XX:+LogCompilation"/>
+      <jvmarg value="-XX:+PrintAssembly"/>
       <arg value="clojure.core"/>
       <arg value="clojure.core.protocols"/>
       <arg value="clojure.main"/>

Patch for Clojure's build.xml to pass extra JVM args for compile-clojure


--- stage2.orig/rootfs/boot/cmdline.txt
+++ stage2/rootfs/boot/cmdline.txt
@@ -1 +1 @@
-console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh

--- stage2.orig/rootfs/boot/cmdline.txt
+++ stage2/rootfs/boot/cmdline.txt
@@ -1 +1 @@
-console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait
+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspberrypi-sys-mods/firstboot

Switch to sys-mods' firstboot script

Switch to sys-mods' firstboot script


--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
@@ -149,6 +149,9 @@
 #define NOMINMAX
 #define BLENDFUNCTION void    // for mingw & gcc
 #include <windows.h>
+#if defined(OPTIONAL) // set within windows.h
+#undef OPTIONAL
+#endif
 #endif
 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
   BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \

--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
@@ -133,9 +133,8 @@
 /*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
  * \brief Implements the 'main' function for the plug-in.
  *
- * This macros implements the main() function for dynamic library.
- * For example, WIN32 requires a DllMain function, while some Unix
- * requires a main() function. This macros takes care of the implementation.
+ * This macros implements the main() function for dynamic library
+ * on Unix for some weird reason.
  */

 // Win32
@@ -149,12 +149,11 @@
 #define NOMINMAX
 #define BLENDFUNCTION void    // for mingw & gcc
 #include <windows.h>
+#if defined(OPTIONAL) // set within windows.h
+#undef OPTIONAL
+#endif
 #endif
 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-  BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \
-  {                                                   \
-      return TRUE;                                    \
-  }                                                   \
   typedef char __CppUnitPlugInImplementMainDummyTypeDef

 // Unix

Drop the unnecessary DllMain from CPPUNIT_PLUGIN_IMPLEMENT_MAIN()

It caused compilation errors even thanks to our workarounds for BOOL
clashes.


diff --git a/setup.py b/setup.py
index 4aedcbfdda..2a4107d033 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,7 @@ if sys.platform == "win32":
     #    system PATH when compiling.
     # 3. The code below will moneky-patch distutils to work.
     import distutils.cygwinccompiler
-    distutils.cygwinccompiler.get_msvcr = lambda: []
-    # Make sure that pthreads is linked statically, otherwise we run into problems
-    # on computers where it is not installed.
-    extra_link_args = ["-static"]
+    distutils.cygwinccompiler.get_msvcr = lambda: []

 def get_c_sources(include_headers=False):

diff --git a/setup.py b/setup.py
index 4aedcbfdda..2a4107d033 100644
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,6 @@ if sys.platform == "win32":
     # 3. The code below will moneky-patch distutils to work.
     import distutils.cygwinccompiler
     distutils.cygwinccompiler.get_msvcr = lambda: []
-    # Make sure that pthreads is linked statically, otherwise we run into problems
-    # on computers where it is not installed.
-    extra_link_args = ["-static"]

 def get_c_sources(include_headers=False):

Remove unnecessary changes from patch

Remove unnecessary changes from patch


# HG changeset patch
# Parent 5f659702021e2d505c40ac4d452e80fe0b7be590
# User Sukhbir Singh <sukhbir.in@gmail.com>
Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397)

diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -812,8 +812,15 @@ pref("mail.smtp.qos", 0);
 pref("mail.nntp.qos", 0);

 // default value for IMAP4
 // in a DSCP environment this should be 56 (0x38, or AF13), ibid.
 pref("mail.imap.qos", 0);

 // PgpMime Addon
 pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
+
+// Send emails with the Date header.
+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409).
+pref("mailnews.local_date_header_generation", true);
+
+// Allow a custom message-ID to be set through an extension.
+pref("mailnews.custom_message_id", false);

# HG changeset patch
# Parent 721cec51e68558ab41a21d7f3db1b7de0e20f3bd
# User Sukhbir Singh <sukhbir.in@gmail.com>
Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397)

diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -814,8 +814,16 @@ pref("mail.smtp.qos", 0);
 pref("mail.nntp.qos", 0);

 // default value for IMAP4
 // in a DSCP environment this should be 56 (0x38, or AF13), ibid.
 pref("mail.imap.qos", 0);

 // PgpMime Addon
 pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
+
+// Send emails with the Date header.
+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409).
+pref("mailnews.local_date_header_generation", true);
+
+// Allow a custom message-ID to be set through an extension.
+pref("mailnews.custom_message_id", false);
+pref("mailnews.header.custom_message_id", "");

Update mailnews.js patch to reflect custom message-ID


--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -400,6 +402,8 @@
         }

         Collections.shuffle(var2);
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (this.field_70963_i == null)
         {

--- ../src-base/common/net/minecraft/src/EntityVillager.java
+++ ../src-work/common/net/minecraft/src/EntityVillager.java
@@ -2,6 +2,8 @@

 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -175,7 +177,7 @@
             case 4:
                 return "/mob/villager/butcher.png";
             default:
-                return super.func_70073_O();
+                return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
         }
     }

@@ -393,6 +395,8 @@
                 func_70949_b(var2, Item.field_77782_ar.field_77779_bT, this.field_70146_Z, 0.3F);
                 func_70949_b(var2, Item.field_77734_bj.field_77779_bT, this.field_70146_Z, 0.3F);
         }
+
+        VillagerRegistry.manageVillagerTrades(var2, this, this.func_70946_n(), this.field_70146_Z);

         if (var2.isEmpty())
         {

Move villager trading hook up a bit. thanks sengir.


--- Python-2.7.1/Python/dynload_shlib.c.orig	2011-12-05 00:00:00.000000000 +0100
+++ Python-2.7.1/Python/dynload_shlib.c	2011-12-05 00:02:51.000000000 +0100
@@ -84,6 +84,15 @@
     PyOS_snprintf(funcname, sizeof(funcname),
                   LEAD_UNDERSCORE "init%.200s", shortname);

+	/* On IOS, dlopen crash as soon as we try to open one of our library.
+	 * Instead, we have done a redirection of linking to convert our .so into a
+	 * .a.  Then the main executable is linked with theses symbol. So, instead
+	 * of trying to dlopen, directly do the dlsym.
+	 * -- Mathieu
+	 */
+    return (dl_funcptr) dlsym(RTLD_MAIN_ONLY, funcname);
+
+#if 0
     if (fp != NULL) {
         int i;
         struct stat statb;
@@ -140,4 +149,5 @@
         handles[nhandles++].handle = handle;
     p = (dl_funcptr) dlsym(handle, funcname);
     return p;
+#endif
 }

--- Python-2.7.1/Python/dynload_shlib.c.orig	2011-12-05 00:00:00.000000000 +0100
+++ Python-2.7.1/Python/dynload_shlib.c	2011-12-05 00:02:51.000000000 +0100
@@ -84,6 +84,15 @@
     PyOS_snprintf(funcname, sizeof(funcname),
                   LEAD_UNDERSCORE "init%.200s", shortname);

+	/* On IOS, dlopen crash as soon as we try to open one of our library.
+	 * Instead, we have done a redirection of linking to convert our .so into a
+	 * .a.  Then the main executable is linked with theses symbol. So, instead
+	 * of trying to dlopen, directly do the dlsym.
+	 * -- Mathieu
+	 */
+    return (dl_funcptr) dlsym(RTLD_SELF, funcname);
+
+#if 0
     if (fp != NULL) {
         int i;
         struct stat statb;
@@ -140,4 +149,5 @@
         handles[nhandles++].handle = handle;
     p = (dl_funcptr) dlsym(handle, funcname);
     return p;
+#endif
 }

Update python loader to load from frameworks as well as main exe (i.e. we have kivy embedded in a framework)


Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp	(revision 103399)
+++ page/FrameView.cpp	(working copy)
@@ -176,10 +176,12 @@
             m_page = page;
             m_page->addScrollableArea(this);

+#if 0
             if (m_frame == m_page->mainFrame()) {
                 ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
                 ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
             }
+#endif
         }
     }
 }
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
@@ -356,9 +356,13 @@

 bool isScrollbarOverlayAPIAvailable()
 {
+#if 0
     static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
                                [lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
     return apiAvailable;
+#else
+    return false;
+#endif
 }

 #endif // USE(WK_SCROLLBAR_PAINTER)

Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp	(revision 106313)
+++ page/FrameView.cpp	(working copy)
@@ -157,10 +157,12 @@
             m_page = page;
             m_page->addScrollableArea(this);

+#if 0
             if (m_frame == m_page->mainFrame()) {
                 ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
                 ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
             }
+#endif
         }
     }
 }
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
@@ -356,9 +356,13 @@

 bool isScrollbarOverlayAPIAvailable()
 {
+#if 0
     static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
                                [lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
     return apiAvailable;
+#else
+    return false;
+#endif
 }

 #endif // USE(WK_SCROLLBAR_PAINTER)

Update to Chromium revision 119867.

Update to Chromium revision 119867.

git-svn-id: 07c9500005b9a5ecd02aa6a59d3db90a097b7e72@505 5089003a-bbd8-11dd-ad1f-f1f9622dbc98


--- ../src_base/common/net/minecraft/src/ItemBucket.java
+++ ../src_work/common/net/minecraft/src/ItemBucket.java
@@ -1,4 +1,6 @@
 package net.minecraft.src;
+
+import net.minecraftforge.event.entity.player.FillBucketEvent;

 public class ItemBucket extends Item
 {
@@ -31,6 +33,17 @@
         }
         else
         {
+            FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, var12);
+            if (event.isCanceled())
+            {
+                return par1ItemStack;
+            }
+
+            if (event.isHandeled())
+            {
+                return event.result;
+            }
+
             if (var12.typeOfHit == EnumMovingObjectType.TILE)
             {
                 int var13 = var12.blockX;
@@ -41,6 +54,7 @@
                 {
                     return par1ItemStack;
                 }
+

                 if (this.isFull == 0)
                 {

--- ../src_base/common/net/minecraft/src/ItemBucket.java
+++ ../src_work/common/net/minecraft/src/ItemBucket.java
@@ -1,4 +1,7 @@
 package net.minecraft.src;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.FillBucketEvent;

 public class ItemBucket extends Item
 {
@@ -31,6 +34,17 @@
         }
         else
         {
+            FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, var12);
+            if (MinecraftForge.EVENT_BUS.post(event))
+            {
+                return par1ItemStack;
+            }
+
+            if (event.isHandeled())
+            {
+                return event.result;
+            }
+
             if (var12.typeOfHit == EnumMovingObjectType.TILE)
             {
                 int var13 = var12.blockX;

Fix FillBucketEvent to actually fire.

Fix FillBucketEvent to actually fire.


diff --git a/setup.py b/setup.py
index 6667adc..bbb9107 100644
--- a/setup.py
+++ b/setup.py
@@ -29,4 +29,5 @@ setup(name = 'sgp4',
         'Topic :: Scientific/Engineering :: Astronomy',
         ],
       packages = ['sgp4'],
+      package_data={'sgp4': ['sgp4/*.out']},
       )

diff --git a/setup.py b/setup.py
index 6667adc..431450c 100644
--- a/setup.py
+++ b/setup.py
@@ -28,5 +28,7 @@ setup(name = 'sgp4',
         'Programming Language :: Python :: 3.4',
         'Topic :: Scientific/Engineering :: Astronomy',
         ],
+      include_package_data=True,
       packages = ['sgp4'],
+      package_data={'sgp4': ['sgp4/*.out']},
       )

Switch on data inclusion in setup

Switch on data inclusion in setup


Index: Makefile
===================================================================
RCS file: /share/freebsd/CVS/ports/misc/Makefile,v
retrieving revision 1.866
diff -u -r1.866 Makefile
--- Makefile	29 Oct 2007 23:47:35 -0000	1.866
+++ Makefile	21 Aug 2008 20:47:38 -0000
@@ -514,5 +514,22 @@
     SUBDIR += ytree
     SUBDIR += zaptel
     SUBDIR += zoneinfo
+# Emulab ports
+    SUBDIR += elvind
+    SUBDIR += emulab-boss
+    SUBDIR += emulab-fs
+    SUBDIR += emulab-ops
+    SUBDIR += emulab-clrhouse
+    SUBDIR += emulab-protogeni
+    SUBDIR += libelvin
+    SUBDIR += emulab-tftp-hpa
+    SUBDIR += p5-GD-old
+    SUBDIR += p5-DBD-mysql50-old
+    SUBDIR += ulsshxmlrpcpp
+    SUBDIR += emulab-iperf
+    SUBDIR += emulab-php4
+    SUBDIR += emulab-mailman
+    SUBDIR += emulab-pubsub
+    SUBDIR += emulab-pubsub-elvincompat

 .include <bsd.port.subdir.mk>

Index: Makefile
===================================================================
RCS file: /share/freebsd/CVS/ports/misc/Makefile,v
retrieving revision 1.918
diff -u -r1.918 Makefile
--- Makefile    29 Jun 2009 12:04:10 -0000      1.918
+++ Makefile    7 Jan 2010 23:14:23 -0000
@@ -561,5 +561,23 @@
     SUBDIR += ytree
     SUBDIR += zaptel
     SUBDIR += zoneinfo
+# Emulab ports
+    SUBDIR += elvind
+    SUBDIR += emulab-boss
+    SUBDIR += emulab-fs
+    SUBDIR += emulab-ops
+    SUBDIR += emulab-clrhouse
+    SUBDIR += emulab-protogeni
+    SUBDIR += libelvin
+    SUBDIR += emulab-tftp-hpa
+    SUBDIR += p5-GD-old
+    SUBDIR += p5-DBD-mysql50-old
+    SUBDIR += ulsshxmlrpcpp
+    SUBDIR += emulab-iperf
+    SUBDIR += emulab-php4
+    SUBDIR += emulab-mailman
+    SUBDIR += emulab-pubsub
+    SUBDIR += emulab-pubsub-elvincompat
+    SUBDIR += emulab-py-m2crypto

 .include <bsd.port.subdir.mk>

Update to reflect new port.

Update to reflect new port.


--- misc/libcdr-0.0.0/src/lib/libcdr_utils.h
+++ misc/build/libcdr-0.0.0/src/lib/libcdr_utils.h
@@ -41,17 +41,8 @@

 #else

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#endif

 #endif

--- misc/libcdr-0.0.0/src/lib/makefile.mk
+++ misc/build/libcdr-0.0.0/src/lib/makefile.mk
@@ -28,6 +28,10 @@
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF

+.IF "$(SYSTEM_ZLIB)" != "YES"
+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
+.ENDIF
+
 SLOFILES= \
         $(SLO)$/CDRDocument.obj \
 		$(SLO)$/CDRInternalStream.obj \

Fix build with internal zlib

Fix build with internal zlib


--- uxterm.orig	2015-01-28 16:16:47.845284223 +0100
+++ uxterm	2015-01-28 16:16:38.165430967 +0100
@@ -111,5 +111,6 @@

 # for testing:
 #test -f ./xterm && XTERM_PROGRAM=./xterm
+COLOR=`hashcolor "$@"`

-exec $XTERM_PROGRAM -class UXTerm -title $whoami -u8 "$@"
+exec $XTERM_PROGRAM -class UXTerm -title $whoami -u8 $COLOR "$@"

--- uxterm.orig	2015-01-29 13:02:19.171709191 +0100
+++ uxterm	2015-01-29 13:01:42.371968810 +0100
@@ -111,5 +111,8 @@

 # for testing:
 #test -f ./xterm && XTERM_PROGRAM=./xterm
+if [ $# -gt 0 ]; then
+	COLOR=`hashcolor "$@"`
+fi

-exec $XTERM_PROGRAM -class UXTerm -title $whoami -u8 "$@"
+exec $XTERM_PROGRAM -class UXTerm -title $whoami -u8 $COLOR "$@"

Change color only if xterm is called with args


Index: package/iwinfo/src/iwinfo_nl80211.c
===================================================================
--- package/iwinfo/src/iwinfo_nl80211.c	(revision 36655)
+++ package/iwinfo/src/iwinfo_nl80211.c	(working copy)
@@ -1940,7 +1940,13 @@
 				goto out;

 			if (!iwinfo_ifmac(res))
+			{
+				/* 8192cu: If virtual interfaces are not supported
+				 * run the scan on the main interface */
+				iwinfo_ifup(ifname);
+				nl80211_get_scanlist_nl(ifname, buf, len);
 				goto out;
+			}

 			/* if we can take the new interface up, the driver supports an
 			 * additional interface and there's no need to tear down the ap */

--- package/iwinfo/src/iwinfo_nl80211.orig.c	2013-05-26 08:47:36.471094286 -0400
+++ package/iwinfo/src/iwinfo_nl80211.c	2013-05-26 08:47:42.611094343 -0400
@@ -1766,7 +1766,13 @@ int nl80211_get_scanlist(const char *ifn
 				goto out;

 			if (!iwinfo_ifmac(res))
+			{
+				/* 8192cu: If virtual interfaces are not supported
+				 * run the scan on the main interface */
+				iwinfo_ifup(ifname);
+				nl80211_get_scanlist_nl(ifname, buf, len);
 				goto out;
+			}

 			/* if we can take the new interface up, the driver supports an
 			 * additional interface and there's no need to tear down the ap */

Update scan-wo-vintf patch to AA source

[wrt] Update scan-wo-vintf patch to AA source


1143c1143
<             '/System/Library/Frameworks/',
---
>             #'/System/Library/Frameworks/',

--- Python-2.5.1/setup.py	2008-07-13 16:37:28.000000000 -0500
+++ Python-2.5.1/setup.py.new	2008-07-13 16:37:18.000000000 -0500
@@ -1140,7 +1140,7 @@
         # different the UNIX search logic is not sharable.
         from os.path import join, exists
         framework_dirs = [
-            '/System/Library/Frameworks/',
+            #'/System/Library/Frameworks/',
             '/Library/Frameworks',
             join(os.getenv('HOME'), '/Library/Frameworks')
         ]

Patch was missing file's location.

Patch was missing file's location.


--- package/iwinfo.orig/src/iwinfo_nl80211.c	2012-11-14 14:51:59.279459532 -0500
+++ package/iwinfo/src/iwinfo_nl80211.c	2012-11-14 14:59:18.129642576 -0500
@@ -1766,7 +1766,13 @@
 				goto out;

 			if (!iwinfo_ifmac(res))
+			{
+				/* 8192cu: If virtual interfaces are not supported
+				 * run the scan on the main interface */
+				iwinfo_ifup(ifname);
+				nl80211_get_scanlist_nl(ifname, buf, len);
 				goto out;
+			}

 			/* if we can take the new interface up, the driver supports an
 			 * additional interface and there's no need to tear down the ap */

Index: package/iwinfo/src/iwinfo_nl80211.c
===================================================================
--- package/iwinfo/src/iwinfo_nl80211.c	(revision 36655)
+++ package/iwinfo/src/iwinfo_nl80211.c	(working copy)
@@ -1940,7 +1940,13 @@
 				goto out;

 			if (!iwinfo_ifmac(res))
+			{
+				/* 8192cu: If virtual interfaces are not supported
+				 * run the scan on the main interface */
+				iwinfo_ifup(ifname);
+				nl80211_get_scanlist_nl(ifname, buf, len);
 				goto out;
+			}

 			/* if we can take the new interface up, the driver supports an
 			 * additional interface and there's no need to tear down the ap */

Update scan wo vintf patch for AA

[wrt] Update scan wo vintf patch for AA


From: Alexis Murzeau <amubtdx@gmail.com>
Date: Sat, 16 Sep 2017 20:09:30 +0200
Subject: Fix manpage generation

A footnote without a new line before seems to cause bad man page
generation by sphinx and trigger the following lintian warning:
W: streamlink: manpage-has-errors-from-man usr/share/man/man1/streamlink.1.gz 533: warning: macro `.' not defined

Forwarded: no
Author: Alexis Murzeau <amubtdx@gmail.com>
---
 docs/cli.rst | 1 +
 1 file changed, 1 insertion(+)

--- a/docs/cli.rst
+++ b/docs/cli.rst
@@ -340,6 +340,7 @@
 Both HTTP and SOCKS5 proxies are supported, authentication is supported for both types.

 For example:
+
 .. code-block:: console

     $ streamlink --http-proxy "http://user:pass@10.10.1.10:3128/" --https-proxy "socks5://10.10.1.10:1242"

From: Alexis Murzeau <amubtdx@gmail.com>
Date: Sat, 16 Sep 2017 20:09:30 +0200
Subject: Fix manpage generation

A footnote without a new line before seems to cause bad man page
generation by sphinx and trigger the following lintian warning:
W: streamlink: manpage-has-errors-from-man usr/share/man/man1/streamlink.1.gz 533: warning: macro `.' not defined

Forwarded: https://github.com/streamlink/streamlink/pull/1230
Author: Alexis Murzeau <amubtdx@gmail.com>
---
 docs/cli.rst | 1 +
 1 file changed, 1 insertion(+)

--- a/docs/cli.rst
+++ b/docs/cli.rst
@@ -340,6 +340,7 @@
 Both HTTP and SOCKS5 proxies are supported, authentication is supported for both types.

 For example:
+
 .. code-block:: console

     $ streamlink --http-proxy "http://user:pass@10.10.1.10:3128/" --https-proxy "socks5://10.10.1.10:1242"

Set forwarded url of manpage fix patch

Set forwarded url of manpage fix patch

Gbp-Dch: Ignore


diff --git a/build_detect_platform b/build_detect_platform
index bb76c4f..ab9524a 100755
--- a/build_detect_platform
+++ b/build_detect_platform
@@ -147,6 +147,17 @@ case "$TARGET_OS" in
         PLATFORM_SHARED_CFLAGS=
         PLATFORM_SHARED_VERSIONED=
         ;;
+    MINGW*)
+        PLATFORM=OS_WINDOWS
+        COMMON_FLAGS="$MEMCMP_FLAG -DOS_WINDOWS -D_REENTRANT -DLEVELDB_PLATFORM_WINDOWS -DWINVER=0x0500 -D__USE_MINGW_ANSI_STDIO=1"
+        PLATFORM_LDFLAGS=
+        PLATFORM_SHARED_CFLAGS=
+        PLATFORM_SOURCES=util/env_win.cc
+        PORT_FILE=port/port_win.cc
+        PLATFORM_LIBS="-lshlwapi"
+        CROSS_COMPILE=true
+        PLATFORM_SHARED_EXT=dll
+        ;;
     *)
         echo "Unknown platform!" >&2
         exit 1

diff --git a/build_detect_platform b/build_detect_platform
index bb76c4f..fb42a0b 100755
--- a/build_detect_platform
+++ b/build_detect_platform
@@ -147,6 +147,17 @@ case "$TARGET_OS" in
         PLATFORM_SHARED_CFLAGS=
         PLATFORM_SHARED_VERSIONED=
         ;;
+    MINGW*)
+        PLATFORM=OS_WINDOWS
+        COMMON_FLAGS="$MEMCMP_FLAG -DOS_WINDOWS -D_REENTRANT -DLEVELDB_PLATFORM_WINDOWS -DWINVER=0x0500 -D__USE_MINGW_ANSI_STDIO=1"
+        PLATFORM_LDFLAGS="-static -static-libgcc -static-libstdc++"
+        PLATFORM_SHARED_CFLAGS=
+        PLATFORM_SOURCES=util/env_win.cc
+        PORT_FILE=port/port_win.cc
+        PLATFORM_LIBS="-lshlwapi"
+        CROSS_COMPILE=true
+        PLATFORM_SHARED_EXT=dll
+        ;;
     *)
         echo "Unknown platform!" >&2
         exit 1

Fix dependencies for Windows library

Fix dependencies for Windows library


--- ../src-base/common/net/minecraft/src/World.java
+++ ../src-work/common/net/minecraft/src/World.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+
+import com.google.common.collect.ImmutableList;

 public abstract class World implements IBlockAccess
 {
@@ -1652,7 +1654,6 @@
             this.func_72847_b((Entity)this.field_72997_g.get(var1));
         }

-        this.field_72997_g.clear();
         this.field_72984_F.func_76318_c("regular");

         for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
@@ -3595,7 +3596,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
-        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
+        return this.field_72986_A.func_76067_t().getHorizon(this);
     }

     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)

--- ../src-base/common/net/minecraft/src/World.java
+++ ../src-work/common/net/minecraft/src/World.java
@@ -3595,7 +3595,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
-        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
+        return this.field_72986_A.func_76067_t().getHorizon(this);
     }

     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)

Fix World patch- workaround no longer required and leftovers are bad.


diff --git a/requirements.txt b/requirements.txt
index e69de29..652997b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+boto3==1.17.*
+rastervision_pipeline==0.13
+awscli==1.19.*
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2fb0a58..6ac077d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,4 +31,10 @@ setup(
     'raster deep-learning ml computer-vision earth-observation geospatial geospatial-processing',
     packages=find_namespace_packages(exclude=['integration_tests*', 'tests*']),
     install_requires=install_requires,
-    zip_safe=False)
+    zip_safe=False,
+    entry_points={
+        'console_scripts': [
+            'rastervision=rastervision.aws_batch',
+        ],
+    }
+)

Set entry point as init file

Set entry point as init file


--- a/data/config.in
+++ b/data/config.in
@@ -5,6 +5,8 @@
	<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
	<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
	<dllmap dll="libintl" target="@INTL@" os="!windows"/>
+	<dllmap dll="libuv" target="libuv.so.1" os="!windows"/>
+	<dllmap dll="System.Native" target="libsystem-native.so.0" />
	<dllmap dll="i:libxslt.dll" target="libxslt@libsuffix@" os="!windows"/>
	<dllmap dll="i:odbc32.dll" target="libodbc@libsuffix@" os="!windows"/>
	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>

--- a/data/config.in
+++ b/data/config.in
@@ -5,6 +5,9 @@
	<dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
	<dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
	<dllmap dll="libintl" target="@INTL@" os="!windows"/>
+	<dllmap dll="libuv" target="libuv.so.1" os="!windows"/>
+	<dllmap dll="e_sqlite3" target="libsqlite3.so.0" os="!windows"/>
+	<dllmap dll="System.Native" target="libsystem-native.so.0" />
	<dllmap dll="i:libxslt.dll" target="libxslt@libsuffix@" os="!windows"/>
	<dllmap dll="i:odbc32.dll" target="libodbc@libsuffix@" os="!windows"/>
	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>

Add the SQlite library name when running EF Core 2 with Mono


--- Makefile.shared.orig	2012-03-19 23:14:57.859439418 -0700
+++ Makefile.shared	2012-03-19 23:17:17.439441634 -0700
@@ -151,7 +152,7 @@
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-rpath,/usr/local/python26/lib -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"

 DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"

--- Makefile.shared.orig	2012-03-19 23:14:57.859439418 -0700
+++ Makefile.shared	2012-03-19 23:17:17.439441634 -0700
@@ -151,7 +152,7 @@
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-rpath,$(INSTALL_PREFIX)/lib -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"

 DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"

Set rpath from INSTALL_PREFX rather than hardcoding the path


--- xgboost-0.6a2/xgboost/Makefile	2016-08-09 04:32:24.000000000 -0500
+++ xgboost-0.6a2/xgboost/Makefile	2017-03-10 15:15:39.000000000 -0600
@@ -43,8 +43,8 @@
 # it is useful for pip install compiling-on-the-fly
 OS := $(shell uname)
 ifeq ($(OS), Darwin)
-export CC = $(if $(shell which gcc-5),gcc-5,clang-omp)
-export CXX = $(if $(shell which g++-5),g++-5,clang-omp++)
+export CC = $(if $(shell which gcc),gcc,clang)
+export CXX = $(if $(shell which g++),g++,clang++)
 endif

 export LDFLAGS= -pthread -lm $(ADD_LDFLAGS) $(DMLC_LDFLAGS) $(PLUGIN_LDFLAGS)

--- xgboost-0.6a2/xgboost/Makefile
+++ xgboost-0.6a2/xgboost/Makefile
@@ -43,8 +43,8 @@
 # it is useful for pip install compiling-on-the-fly
 OS := $(shell uname)
 ifeq ($(OS), Darwin)
-export CC = $(if $(shell which gcc-5),gcc-5,clang-omp)
-export CXX = $(if $(shell which g++-5),g++-5,clang-omp++)
+export CC = clang
+export CXX = clang++
 endif

 export LDFLAGS= -pthread -lm $(ADD_LDFLAGS) $(DMLC_LDFLAGS) $(PLUGIN_LDFLAGS)

Update makefile patch to only use clang/clang++


Patch for C4::Letters - adding a <<pickupday>> tag for use in Notices and Slips
Use case: a printable pickup number with reserve_id can then be used as such

<<pickupday>>/<<reserves.reserve_id>>

diff --git a/Letters.pm b/lib/C4/Letters.pm
index 26f3e46..40fccf0 100644
--- a/Letters.pm
+++ b/lib/C4/Letters.pm
@@ -807,6 +807,11 @@ sub _parseletter {
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};

+        # Deichman mod: add a custom tag '<<pickupday>>' for hold pickup day to use in slips
+        if ($letter->{content} && $letter->{content} =~ /<<pickupday>>/) {
+            $letter->{content} =~ s/<<pickupday>>/$waitingdate[-1]/go;
+        }
+
         $values->{'expirationdate'} = '';
         if ( C4::Context->preference('ReservesMaxPickUpDelay') ) {
             my $dt = dt_from_string();

Patch for C4::Letters - adding a <<pickupday>> tag for use in Notices and Slips
Use case: a printable pickup number with reserve_id can then be used as such

<<pickupday>>/<<reserves.reserve_id>>

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 26f3e46..40fccf0 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -807,6 +807,11 @@ sub _parseletter {
     if ( $table eq 'reserves' && $values->{'waitingdate'} ) {
         my @waitingdate = split /-/, $values->{'waitingdate'};

+        # Deichman mod: add a custom tag '<<pickupday>>' for hold pickup day to use in slips
+        if ($letter->{content} && $letter->{content} =~ /<<pickupday>>/) {
+            $letter->{content} =~ s/<<pickupday>>/$waitingdate[-1]/go;
+        }
+
         $values->{'expirationdate'} = '';
         if ( C4::Context->preference('ReservesMaxPickUpDelay') ) {
             my $dt = dt_from_string();

Fix patch paths in previous commit

Fix patch paths in previous commit


Revert "Fix usage of std::string in EC2 code on solaris"

This reverts commit 84a2267ac8572f68f999f0043e81dd3f4c7d6acb.

Now that we've updated the compiler used on solaris, this change
shouldn't be necessary.


diff --git a/openquake/engine/openquake.cfg b/openquake/engine/openquake.cfg
index 818f6882e9..a6329a3905 100644
--- a/openquake/engine/openquake.cfg
+++ b/openquake/engine/openquake.cfg
@@ -40,13 +40,15 @@ celery_queue = celery

 [dbserver]
 # enable multi_user if you have a multiple user installation
-multi_user = false
-file = ~/oqdata/db.sqlite3
-log = ~/oqdata/dbserver.log
+multi_user = true
+file = /var/lib/openquake/db.sqlite3
+log = /var/lib/openquake/dbserver.log
 host = 127.0.0.1
-# port 1908 has a good reputation:
-# https://isc.sans.edu/port.html?port=1908
-port = 1908
+# for packages we use port 1907 to avoid conflicts
+# with local development installations
+# https://isc.sans.edu/port.html?port=1907
+port = 1907
 authkey = changeme

 [zworkers]

Index: oq-engine/openquake/engine/openquake.cfg
===================================================================
--- oq-engine.orig/openquake/engine/openquake.cfg	2018-03-15 08:47:12.245368066 +0200
+++ oq-engine/openquake/engine/openquake.cfg	2018-03-15 08:47:12.245368066 +0200
@@ -39,15 +39,14 @@
 celery_queue = celery

 [dbserver]
-# enable multi_user if you have a multiple user installation
-multi_user = false
-file = ~/oqdata/db.sqlite3
-log = ~/oqdata/dbserver.log
+multi_user = true
+file = /var/lib/openquake/db.sqlite3
+log = /var/lib/openquake/dbserver.log
 host = 127.0.0.1
-# port 1908 has a good reputation:
-# https://isc.sans.edu/port.html?port=1908
-port = 1908
-authkey = changeme
+# for packages we use port 1907 to avoid conflicts
+# with local development installations
+# https://isc.sans.edu/port.html?port=1907
+port = 1907

 [zworkers]
 master_host = 127.0.0.1

Make quilt happy with the new patch

Make quilt happy with the new patch [skip ci]

Former-commit-id: f1e9028c035f129cb98cdbf8f2126a0b5d1f7ea0 [formerly fb30a3529dc5485711acb6bcd34f0c05f0d9f48d]
Former-commit-id: 969f0fbd9023abb1ff244b81931070a0b002f39f


9c9
<     <Production>0</Production>           <!-- 1-running in production mode, 0-development mode (enable debugging framework) -->
---
>     <Production>1</Production>           <!-- 1-running in production mode, 0-development mode (enable debugging framework) -->
16d15
<     <Ports>8080-8090</Ports>                         <!-- List of ports that we can listen on (when running multiple MiServers -->
40c39
<     <TrapErrors>0</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
---
>     <TrapErrors>1</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
45c44
<     <UseHTTP>1</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->
---
>     <UseHTTP>0</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->

9c9
<     <Production>0</Production>           <!-- 1-running in production mode, 0-development mode (enable debugging framework) -->
---
>     <Production>1</Production>           <!-- 1-running in production mode, 0-development mode (enable debugging framework) -->
12c12
<     <CloseOnCrash>0</CloseOnCrash>       <!-- Set to 1 to force []OFF on an unhandled server error -->
---
>     <CloseOnCrash>1</CloseOnCrash>       <!-- Set to 1 to force []OFF on an unhandled server error -->
17d16
<     <Ports>8080-8090</Ports>                         <!-- List of ports that we can listen on (when running multiple MiServers -->
41c40
<     <TrapErrors>0</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
---
>     <TrapErrors>1</TrapErrors>    <!-- Valid: 0=Crash, 1=Trap and Log errors -->
46c45
<     <UseHTTP>1</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->
---
>     <UseHTTP>0</UseHTTP>          <!-- Valid: 0=use DrA generated HTML, 1=report HTTP 500 status -->

Update to exit on error

Update to exit on error


Description: Fix race creating unix socket in tests.
  There seems to be a race between the Redis server strarting up and
  the unix socket test. This gives redis a little more time to create
  the socket file.
Author: Tom Lee <debian@tomlee.co>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,12 @@

 check: hiredis-test
 	@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
+	for i in 1 2 3 4 5; do \
+		if [ -r /tmp/hiredis-test-redis.sock ]; then \
+			break; \
+		fi; \
+		sleep 1; \
+	done
 	$(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
 			( kill `cat /tmp/hiredis-test-redis.pid` && false )
 	kill `cat /tmp/hiredis-test-redis.pid`

Work around a race in 'make check'

Work around a race in 'make check'


diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
index ada33bf..001eace 100644
--- a/profiles/apparmor/template.go
+++ b/profiles/apparmor/template.go
@@ -42,5 +42,12 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   ptrace (trace,read) peer=docker-default,
 {{end}}
+
+  # Ubuntu Snappy 15.04 tweaks
+  ptrace (readby, tracedby) peer="docker_docker{,-daemon}_*",
+  signal (receive) peer="docker_docker{,-daemon}_*",
+  # Ubuntu Snappy 16-series tweaks
+  ptrace (readby, tracedby) peer="snap.docker.dockerd",
+  signal (receive) peer="snap.docker.dockerd",
 }
 `

diff --git a/profiles/apparmor/template.go b/profiles/apparmor/template.go
index ada33bf..39d3525 100644
--- a/profiles/apparmor/template.go
+++ b/profiles/apparmor/template.go
@@ -42,5 +42,16 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   ptrace (trace,read) peer=docker-default,
 {{end}}
+
+  # Ubuntu Snappy 15.04 tweaks
+  #   Allow the daemon to trace/signal containers
+  ptrace (readby, tracedby) peer="docker_docker{,-daemon}_*",
+  signal (receive) peer="docker_docker{,-daemon}_*",
+  # Ubuntu Snappy 16-series tweaks
+  #   Allow the daemon to trace/signal containers
+  ptrace (readby, tracedby) peer="snap.docker.dockerd",
+  signal (receive) peer="snap.docker.dockerd",
+  #   Allow container processes to signal other container processes
+  signal (send, receive) peer=docker-default,
 }
 `

Allow containers processes to swap signals


diff --git a/test-suite/Makefile b/test-suite/Makefile
index c16fe40..df8f7b8 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -1692,7 +1692,6 @@ SCM_TESTS = tests/00-initial-env.test		\
 	    tests/popen.test			\
 	    tests/popen-child.scm		\
 	    tests/ports.test			\
-	    tests/posix.test			\
 	    tests/q.test			\
 	    tests/r4rs.test			\
 	    tests/r5rs_pitfall.test		\

diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index 45c6f29..c38e15c 100644
--- a/test-suite/Makefile.in
+++ b/test-suite/Makefile.in
@@ -1692,7 +1692,6 @@ SCM_TESTS = tests/00-initial-env.test		\
 	    tests/popen.test			\
 	    tests/popen-child.scm		\
 	    tests/ports.test			\
-	    tests/posix.test			\
 	    tests/q.test			\
 	    tests/r4rs.test			\
 	    tests/r5rs_pitfall.test		\

Patch Makefile.in instead of Makefile

Patch Makefile.in instead of Makefile


--- setup.py.orig	2021-07-06 17:17:07.000000000 -0600
+++ setup.py	2021-07-06 17:19:48.000000000 -0600
@@ -6,9 +6,9 @@
 from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext

-src_root = pathlib.Path(__file__).parent / "lib"
+src_root = Path("lib")
 sources = [
-    src_root.joinpath(s).as_posix() for s in ["Ppmd7.c", "Ppmd7Dec.c", "Ppmd7Enc.c", "Ppmd8.c", "Ppmd8Dec.c", "Ppmd8Enc.c"]
+    src_root.joinpath(s) for s in ["Ppmd7.c", "Ppmd7Dec.c", "Ppmd7Enc.c", "Ppmd8.c", "Ppmd8Dec.c", "Ppmd8Enc.c"]
 ]

 _ppmd_extension = Extension("pyppmd._ppmd", sources)
@@ -51,7 +51,7 @@
     def build_extensions(self):
         if "msvc" in self.compiler.compiler_type.lower():
             for extension in self.extensions:
-                more_options = ["/Ob3", "/GF", "/Gy"]
+                more_options = ["/GF", "/Gy"]
                 extension.extra_compile_args.extend(more_options)
         super().build_extensions()

--- setup.py.orig	2021-07-06 17:17:07.000000000 -0600
+++ setup.py	2021-07-06 17:19:48.000000000 -0600
@@ -6,9 +6,9 @@
 from setuptools import Extension, setup
 from setuptools.command.build_ext import build_ext

-src_root = pathlib.Path(__file__).parent / "lib"
+src_root = pathlib.Path("lib")
 sources = [
     src_root.joinpath(s).as_posix() for s in ["Ppmd7.c", "Ppmd7Dec.c", "Ppmd7Enc.c", "Ppmd8.c", "Ppmd8Dec.c", "Ppmd8Enc.c"]
 ]

 _ppmd_extension = Extension("pyppmd._ppmd", sources)
@@ -51,7 +51,7 @@
     def build_extensions(self):
         if "msvc" in self.compiler.compiler_type.lower():
             for extension in self.extensions:
-                more_options = ["/Ob3", "/GF", "/Gy"]
+                more_options = ["/GF", "/Gy"]
                 extension.extra_compile_args.extend(more_options)
         super().build_extensions()

Correct patch to build on Windows

Correct patch to build on Windows


Description: Fix FTBFS on Hurd.
Author: Svante Signell <svante.signell@gmail.com>
Origin: vendor
Bug-Debian: http://bugs.debian.org/753698
Forwarded: no
Last-Update: 2014-08-28

--- a/configure.ac.orig	2013-08-15 06:36:22.000000000 +0200
+++ b/configure.ac	2014-08-24 15:20:22.000000000 +0200
@@ -900,7 +900,7 @@
 dnl build from c-client.  Most of this will go away when c-client
 dnl adopts configure
 case "$host" in
-  *-linux-gnu*|*-k*bsd*-gnu*)
+  *-linux-gnu*|*-k*bsd*-gnu*| *-gnu*)
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     if test -f /etc/fedora-release ; then

Description: Fix FTBFS on Hurd.
Author: Svante Signell <svante.signell@gmail.com>
Origin: vendor
Bug-Debian: http://bugs.debian.org/753698
Forwarded: no
Reviewed-by: Asheesh Laroia <paulproteus@debian.org>
Last-Update: 2014-08-28

--- a/configure.ac.orig	2013-08-15 06:36:22.000000000 +0200
+++ b/configure.ac	2014-08-24 15:20:22.000000000 +0200
@@ -900,7 +900,7 @@
 dnl build from c-client.  Most of this will go away when c-client
 dnl adopts configure
 case "$host" in
-  *-linux-gnu*|*-k*bsd*-gnu*)
+  *-linux-gnu*|*-k*bsd*-gnu*|*-gnu*)
     alpine_path_delim="/"
     alpine_mode_readonly="(0600)"
     if test -f /etc/fedora-release ; then

Remove unnecessary space, and mark it as reviewed


diff --git a/src/vmm/LibVirtDriver.cc b/src/vmm/LibVirtDriver.cc
index c55468d..e579e10 100644
--- a/src/vmm/LibVirtDriver.cc
+++ b/src/vmm/LibVirtDriver.cc
@@ -143,7 +143,7 @@ int LibVirtDriver::deployment_description(

     if (emulator == "kvm")
     {
-        file << "\t\t<type>hvm</type>" << endl;
+        file << "\t\t<type machine='pc'>hvm</type>" << endl;
     }

     num = vm->get_template_attribute("OS",attrs);

Add trailing line to patch

Add trailing line to patch


--- libmagic.rb.orig	2013-07-30 00:49:48.000000000 +0100
+++ libmagic.rb.new	2013-07-30 00:49:24.000000000 +0100
@@ -12,7 +12,11 @@

   # Fixed upstream, should be in next release
   # See http://bugs.gw.com/view.php?id=230
-  def patches; DATA; end if MacOS.version < :lion
+  def patches
+    p = []
+    p << DATA if MacOS.version < :lion
+    p << 'https://gist.github.com/kwilczynski/6108866/raw/15d1f0a2dba5da23e820b503e8551346a4d235eb/file-5.14.diff'
+  end

   def install
     ENV.universal_binary if build.universal?

--- libmagic.rb.orig	2013-07-30 00:49:48.000000000 +0100
+++ libmagic.rb.new	2013-07-30 04:12:29.000000000 +0100
@@ -12,7 +12,13 @@

   # Fixed upstream, should be in next release
   # See http://bugs.gw.com/view.php?id=230
-  def patches; DATA; end if MacOS.version < :lion
+  def patches
+    p = []
+    p << DATA if MacOS.version < :lion
+    # Fixes generaly incorrect code, plus issues with certain
+    # versions of cpp. Not fixed in upstream yet.
+    p << 'https://gist.github.com/kwilczynski/6108866/raw/15d1f0a2dba5da23e820b503e8551346a4d235eb/file-5.14.diff'
+  end

   def install
     ENV.universal_binary if build.universal?

Add comment as per Homebrew guidelines.

Add comment as per Homebrew guidelines.

As per: https://github.com/mxcl/homebrew/wiki/Formula-Cookbook#patches

Signed-off-by: Krzysztof Wilczynski <9bf091559fc98493329f7d619638c79e91ccf029@linux.com>


9c9
<   echo ".dump" | @SQL_BINDIR@/sqlite bacula.db >bacula.sql
---
>   echo ".dump" | /usr/lib/sqlite/sqlite bacula.db >bacula.sql
12c12
<     @SQL_BINDIR@/mysqldump $* -f --opt bacula >bacula.sql
---
>     /usr/bin/mysqldump $* -f --opt bacula >bacula.sql
14c14
<     @SQL_BINDIR@/pg_dump $* bacula >bacula.sql
---
>     /usr/bin/pg_dump $* bacula >bacula.sql
20c20
< #     rm -f @SQL_BINDIR@/../var/bacula/*
---
> #     rm -f /var/lib/mysql/bacula/*

9c9
<   echo ".dump" | @SQL_BINDIR@/sqlite $* bacula.db >bacula.sql
---
>   echo ".dump" | /usr/lib/sqlite/sqlite $* bacula.db >bacula.sql
12c12
<     @SQL_BINDIR@/mysqldump $* -f --opt bacula >bacula.sql
---
>     /usr/bin/mysqldump $* -f --opt bacula >bacula.sql
14c14
<     @SQL_BINDIR@/pg_dump $* bacula >bacula.sql
---
>     /usr/bin/pg_dump $* bacula >bacula.sql
20c20
< #     rm -f @SQL_BINDIR@/../var/bacula/*
---
> #     rm -f /var/lib/mysql/bacula/*

Update rpm patch for make_catalog_backup script.

git-svn-id: bb0627f6f70d46b61088c62c6186faa4b96a9496@1411 91ce42f0-d328-0410-95d8-f526ca767f89


patch-package
--- a/node_modules/dd-trace/src/format.js
+++ b/node_modules/dd-trace/src/format.js
@@ -57,10 +57,18 @@ function extractTags (trace, span) {
       case 'error.msg':
       case 'error.stack':
         trace.error = 1
-        trace.meta[tag] = String(tags[tag])
+        try {
+          trace.meta[tag] = String(tags[tag])
+        } catch (e) {
+          console.error("error:", e.message, "tag:", tag, "value:", tags[tag], "prototype:", tags[tag] ? tags[tag].__proto__ : undefined)
+        }
         break
       default:
-        trace.meta[tag] = String(tags[tag])
+        try {
+          trace.meta[tag] = String(tags[tag])
+        } catch (e) {
+          console.error("error:", e.message, "tag:", tag, "value:", tags[tag], "prototype:", tags[tag] ? tags[tag].__proto__ : undefined)
+        }
     }
   })
 }

patch-package
--- a/node_modules/dd-trace/src/format.js
+++ b/node_modules/dd-trace/src/format.js
@@ -46,7 +46,7 @@ function extractTags (trace, span) {
       case 'service.name':
       case 'span.type':
       case 'resource.name':
-        trace[map[tag]] = String(tags[tag])
+        trace[map[tag]] = serialize(tags[tag])
         break
       case 'error':
         if (tags[tag]) {
@@ -57,14 +57,18 @@ function extractTags (trace, span) {
       case 'error.msg':
       case 'error.stack':
         trace.error = 1
-        trace.meta[tag] = String(tags[tag])
+        trace.meta[tag] = serialize(tags[tag])
         break
       default:
-        trace.meta[tag] = String(tags[tag])
+        trace.meta[tag] = serialize(tags[tag])
     }
   })
 }

+function serialize(obj) {
+  return obj && !obj.toString ? JSON.stringify(obj) : String(obj)
+}
+
 function extractError (trace, span) {
   const error = span._error

[dd-trace] Test a patch that should work around the type error.


diff -r -u s2n/crypto/s2n_hmac.c s2n_break/crypto/s2n_hmac.c
--- s2n/crypto/s2n_hmac.c	2016-05-23 09:59:56.600873694 -0700
+++ s2n_break/crypto/s2n_hmac.c	2016-05-27 16:12:24.278698053 -0700
@@ -193,7 +193,7 @@
      * input. On some platforms, including Intel, the operation can take a
      * smaller number of cycles if the input is "small".
      */
-    state->currently_in_hash_block += (4294949760 + size) % state->hash_block_size;
+    state->currently_in_hash_block += (4294949761 + size) % state->hash_block_size;
     state->currently_in_hash_block %= state->block_size;

     return s2n_hash_update(&state->inner, in, size);
Binary files s2n/.git/index and s2n_break/.git/index differ
Only in s2n/tests/saw: bad_magic_mod.patch

diff -r -u s2n/crypto/s2n_hmac.c s2n_break/crypto/s2n_hmac.c
--- s2n/crypto/s2n_hmac.c	2016-05-23 09:59:56.600873694 -0700
+++ s2n_break/crypto/s2n_hmac.c	2016-05-27 16:12:24.278698053 -0700
@@ -193,7 +193,7 @@
      * input. On some platforms, including Intel, the operation can take a
      * smaller number of cycles if the input is "small".
      */
-    state->currently_in_hash_block += (4294949760 + size) % state->hash_block_size;
+    state->currently_in_hash_block += (4294949761 + size) % state->hash_block_size;
     state->currently_in_hash_block %= state->hash_block_size;

     return s2n_hash_update(&state->inner, in, size);
Binary files s2n/.git/index and s2n_break/.git/index differ
Only in s2n/tests/saw: bad_magic_mod.patch

Fix SAW Patchfile to work with renamed variable


--- ../src-base/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
 import net.minecraft.server.MinecraftServer;

 public class ConsoleCommandHandler
@@ -397,7 +399,7 @@
                                 var6.func_2_b("Ban list:" + this.func_40648_a(this.field_22116_b.func_40025_r(), ", "));
                             }
                         }
-                        else
+                        else if (!FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6))
                         {
                             field_22117_a.info("Unknown console command. Type \"help\" for help.");
                         }

--- ../src-base/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft_server/net/minecraft/src/ConsoleCommandHandler.java	0000-00-00 00:00:00.000000000 -0000
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLServerHandler;
 import net.minecraft.server.MinecraftServer;

 public class ConsoleCommandHandler
@@ -397,6 +399,10 @@
                                 var6.func_2_b("Ban list:" + this.func_40648_a(this.field_22116_b.func_40025_r(), ", "));
                             }
                         }
+                        else if (FMLServerHandler.instance().handleServerCommand(var2, var6.func_1_c(), var6))
+                        {
+
+                        }
                         else
                         {
                             field_22117_a.info("Unknown console command. Type \"help\" for help.");

Tweak Console handler patch so we're more friendly to forge


--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@
 uninstall:
 	rm -rf $(DESTDIR)$(PREFIX)/bin/gitfs

-$(BUILD_DIR)/gitfs: $(BUILD_DIR) $(VIRTUAL_ENV)/bin/pex
-	$(VIRTUAL_ENV)/bin/pex -v --disable-cache -r requirements.txt -e gitfs:mount -o $(BUILD_DIR)/gitfs .
+$(BUILD_DIR)/gitfs: $(BUILD_DIR)
+	/usr/bin/pex -v --cache-dir=debian/packages/ --repo=debian/packages/ -r requirements.txt -e gitfs:mount -o $(BUILD_DIR)/gitfs .

 $(VIRTUAL_ENV)/bin/pex: virtualenv
 	$(VIRTUAL_ENV)/bin/pip install pex wheel

--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@
 uninstall:
 	rm -rf $(DESTDIR)$(PREFIX)/bin/gitfs

-$(BUILD_DIR)/gitfs: $(BUILD_DIR) $(VIRTUAL_ENV)/bin/pex
-	$(VIRTUAL_ENV)/bin/pex -v --disable-cache -r requirements.txt -e gitfs:mount -o $(BUILD_DIR)/gitfs .
+$(BUILD_DIR)/gitfs: $(BUILD_DIR)
+	/usr/bin/pex -v --cache-dir=debian/packages/ --repo=debian/packages/ -r 'fusepy==2.0.2' -r 'pygit2==0.24.1' -r 'atomiclong==0.1.1' -r 'raven==5.27.0' -r 'six==1.10.0' -s . -e gitfs:mount -o $(BUILD_DIR)/gitfs

 $(VIRTUAL_ENV)/bin/pex: virtualenv
 	$(VIRTUAL_ENV)/bin/pip install pex wheel

Revert back to inline requirements.

Revert back to inline requirements.


--- a/git/config
+++ b/git/config
@@ -14,3 +14,3 @@
   eol = lf
-  pager = delta --dark
+  pager = delta --light
   quotePath = false
@@ -26,3 +26,3 @@
 [interactive]
-  diffFilter = delta --color-only --dark
+  diffFilter = delta --color-only --light
 [log]
--- a/vscode/user-data/User/settings.json
+++ b/vscode/user-data/User/settings.json
@@ -51,3 +51,3 @@
   "window.restoreWindows": "none",
-  "workbench.colorTheme": "Default Dark+",
+  "workbench.colorTheme": "Default Light+",
   "workbench.editor.enablePreview": false,

--- a/git/config
+++ b/git/config
@@ -14,3 +14,3 @@
   eol = lf
-  pager = delta --dark
+  pager = delta --light
   quotePath = false
@@ -26,3 +26,3 @@
 [interactive]
-  diffFilter = delta --color-only --dark
+  diffFilter = delta --color-only --light
 [log]
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -51,3 +51,3 @@
   "window.restoreWindows": "none",
-  "workbench.colorTheme": "Default Dark+",
+  "workbench.colorTheme": "Default Light+",
   "workbench.editor.enablePreview": false,

Fix vscode settings path in patch

Fix vscode settings path in patch


diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ecc7d44
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:latest
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  git \
+  unzip \
+  wget \
+  zip
+
+WORKDIR /app
+
+COPY . .
+
+RUN php artisan key:generate
+
+CMD php -S 0.0.0.0:8000 -t public/

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ecc7d44
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,16 @@
+FROM php:latest
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  git \
+  unzip \
+  wget \
+  zip
+
+WORKDIR /app
+
+COPY . .
+
+RUN php artisan key:generate
+
+CMD php -S 0.0.0.0:8000 server.php

Call the PHP webserver as Laravel does

Call the PHP webserver as Laravel does

This doesn't make a difference to use now, but could save some
debugging in future


Fix patch file -- missing comma

Fix patch file -- missing comma


Index: 002_offline_event.patch
===================================================================
--- 002_offline_event.patch	(revision 513088)
+++ 002_offline_event.patch	(working copy)
@@ -1,17 +0,0 @@
-? 002_offline_event.patch
-Index: iris/xmpp-im/types.cpp
-===================================================================
-RCS file: /home/kde/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp,v
-retrieving revision 1.3
-diff -u -p -r1.3 types.cpp
---- iris/xmpp-im/types.cpp	21 May 2004 14:35:44 -0000	1.3
-+++ iris/xmpp-im/types.cpp	5 Feb 2005 21:04:44 -0000
-@@ -639,6 +639,8 @@ bool Message::fromStanza(const Stanza &s
- 				d->eventList += ComposingEvent;
- 			else if (evtag == "delivered")
- 				d->eventList += DeliveredEvent;
-+			else if (evtag == "offline")
-+				d->eventList += OfflineEvent;
- 		}
- 		if (d->eventList.isEmpty())
- 			d->eventList += CancelEvent;
Index: iris/xmpp-im/types.cpp
===================================================================
--- iris/xmpp-im/types.cpp	(revision 513088)
+++ iris/xmpp-im/types.cpp	(working copy)
@@ -641,6 +641,8 @@
 				d->eventList += ComposingEvent;
 			else if (evtag == "delivered")
 				d->eventList += DeliveredEvent;
+			else if (evtag == "offline")
+				d->eventList += OfflineEvent;
 		}
 		if (d->eventList.isEmpty())
 			d->eventList += CancelEvent;

This patch adds an offline event to the event list for a message
when converting it from a stanza to a message

Index: iris/xmpp-im/types.cpp
===================================================================
--- iris/xmpp-im/types.cpp	(revision 513088)
+++ iris/xmpp-im/types.cpp	(working copy)
@@ -1722,6 +1722,8 @@
 				d->eventList += ComposingEvent;
 			else if (evtag == "delivered")
 				d->eventList += DeliveredEvent;
+			else if (evtag == "offline")
+				d->eventList += OfflineEvent;
 		}
 		if (d->eventList.isEmpty())
 			d->eventList += CancelEvent;

Update the patch so it doesn't contain a diff of itself and so it
has the right line numbers in order to avoid using an offset when
applying it.

svn path=/trunk/KDE/kdenetwork/kopete/; revision=769813


--- setup.py
+++ setup.py
@@ -105,7 +105,7 @@
                     'macros': stan_macros})

 ## extensions
-extensions_extra_compile_args = ['-O0', '-ftemplate-depth-256']
+extensions_extra_compile_args = ['/EHsc', '/Ox', '-DBOOST_DATE_TIME_NO_LIB']

 stanc_sources = [
     "pystan/stan/src/stan/gm/grammars/var_decls_grammar_inst.cpp",

--- pystan\model.py
+++ pystan\model.py
@@ -279,7 +280,7 @@
             s = template.safe_substitute(model_cppname=self.model_cppname)
             outfile.write(s)

-        extra_compile_args = ['-O3', '-ftemplate-depth-256']
+        extra_compile_args = ['/EHsc', '/Ox', '-DBOOST_DATE_TIME_NO_LIB']
         distutils.log.set_verbosity(verbose)
         extension = Extension(name=module_name,
                               language="c++",

--- pystan\stan\src\stan\gm\grammars\functions_grammar_def.hpp
+++ pystan\stan\src\stan\gm\grammars\functions_grammar_def.hpp
@@ -126,7 +126,7 @@
       static bool fun_exists(const std::set<std::pair<std::string,
                                                       function_signature_t> >& existing,
                              const std::pair<std::string,function_signature_t>& name_sig) {
-        for (std::set<std::pair<std::string, function_signature_t> >::iterator it
+        for (std::set<std::pair<std::string, function_signature_t> >::const_iterator it
                = existing.begin();
              it != existing.end();
              ++it)

--- setup.py
+++ setup.py
@@ -119,7 +119,7 @@ libstan = ('stan', {'sources': libstan_sources,
                     'macros': stan_macros})

 ## extensions
-extensions_extra_compile_args = ['-O0', '-ftemplate-depth-256']
+extensions_extra_compile_args = ['/EHsc', '/Ox', '-DBOOST_DATE_TIME_NO_LIB']

 stanc_sources = [
     "pystan/stan/src/stan/gm/ast_def.cpp",

--- pystan\model.py
+++ pystan\model.py
@@ -279,7 +280,7 @@
             s = template.safe_substitute(model_cppname=self.model_cppname)
             outfile.write(s)

-        extra_compile_args = ['-O3', '-ftemplate-depth-256']
+        extra_compile_args = ['/EHsc', '/Ox', '-DBOOST_DATE_TIME_NO_LIB']
         distutils.log.set_verbosity(verbose)
         extension = Extension(name=module_name,
                               language="c++",

Update windows patch for pystan

Update windows patch for pystan


--- ../src_base/common/net/minecraft/src/BlockContainer.java
+++ ../src_work/common/net/minecraft/src/BlockContainer.java
@@ -20,7 +20,7 @@
     public void onBlockAdded(World par1World, int par2, int par3, int par4)
     {
         super.onBlockAdded(par1World, par2, par3, par4);
-        par1World.setBlockTileEntity(par2, par3, par4, this.createNewTileEntity(par1World));
+        par1World.setBlockTileEntity(par2, par3, par4, this.createNewTileEntity(par1World, par1World.getBlockMetadata(par2, par3, par4)));
     }

     /**
@@ -36,6 +36,12 @@
      * each class overrdies this to return a new <className>
      */
     public abstract TileEntity createNewTileEntity(World var1);
+
+
+    public TileEntity createNewTileEntity(World world, int metadata)
+    {
+        return createNewTileEntity(world);
+    }

     /**
      * Called when the block receives a BlockEvent - see World.addBlockEvent. By default, passes it on to the tile

--- ../src_base/common/net/minecraft/src/BlockContainer.java
+++ ../src_work/common/net/minecraft/src/BlockContainer.java
@@ -20,7 +20,7 @@
     public void onBlockAdded(World par1World, int par2, int par3, int par4)
     {
         super.onBlockAdded(par1World, par2, par3, par4);
-        par1World.setBlockTileEntity(par2, par3, par4, this.createNewTileEntity(par1World));
+        par1World.setBlockTileEntity(par2, par3, par4, this.createTileEntity(par1World, par1World.getBlockMetadata(par2, par3, par4)));
     }

     /**
@@ -36,6 +36,12 @@
      * each class overrdies this to return a new <className>
      */
     public abstract TileEntity createNewTileEntity(World var1);
+
+
+    public TileEntity createNewTileEntity(World world, int metadata)
+    {
+        return createNewTileEntity(world);
+    }

     /**
      * Called when the block receives a BlockEvent - see World.addBlockEvent. By default, passes it on to the tile

Fix call to createTileEntity on blocks that extend BlockContainer.


Index: test/Makefile
===================================================================
--- test/Makefile	(revision 154661)
+++ test/Makefile	(working copy)
@@ -61,14 +61,22 @@
 ifndef TESTSUITE
 ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test

 # Force creation of Clang's lit.site.cfg.
 clang-lit-site-cfg: FORCE
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-lit-site-cfgs:: clang-lit-site-cfg
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
 endif
+endif

 IGNORE_TESTS :=

Index: test/Makefile
===================================================================
--- test/Makefile	(revision 154169)
+++ test/Makefile	(working copy)
@@ -67,8 +67,17 @@
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-lit-site-cfgs:: clang-lit-site-cfg
 endif
+
+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
+endif

 IGNORE_TESTS :=

Allow NOCLING also for test-all. Needs repositioning of if-cling.

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@43743 27541ba8-7e3a-0410-8455-c3a389f83636


diff --git a/requirements.txt b/requirements.txt
index e69de29..652997b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+boto3
+rastervision_pipeline==0.13.1
+awscli
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2fb0a58..6ac077d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,4 +31,10 @@ setup(
     'raster deep-learning ml computer-vision earth-observation geospatial geospatial-processing',
     packages=find_namespace_packages(exclude=['integration_tests*', 'tests*']),
     install_requires=install_requires,
-    zip_safe=False)
+    zip_safe=False,
+    entry_points={
+        'console_scripts': [
+            'rastervision=rastervision.aws_batch.aws_batch_runner:main',
+        ],
+    }
+)

diff --git a/requirements.txt b/requirements.txt
index e8b2278..c2184e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 boto3
 rastervision_pipeline==0.13.1
-awscli
+awscli
diff --git a/setup.py b/setup.py
index 2fb0a58..6ac077d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,4 +31,10 @@ setup(
     'raster deep-learning ml computer-vision earth-observation geospatial geospatial-processing',
     packages=find_namespace_packages(exclude=['integration_tests*', 'tests*']),
     install_requires=install_requires,
-    zip_safe=False)
+    zip_safe=False,
+    entry_points={
+        'console_scripts': [
+            'rastervision=rastervision.aws_batch.aws_batch_runner:main',
+        ],
+    }
+)

Fix issue with patch file

Fix issue with patch file


--- sdl2/__init__.py
+++ sdl2/__init__.py
@@ -1,4 +1,16 @@
 """SDL2 wrapper package"""
+# Direct this module to Ana/Miniconda's lib folder, where the SDL2 libraries
+# can be found.
+import os
+
+if not "PYSDL2_DLL_PATH" in os.environ:
+	if os.name == "posix":
+		os.environ["PYSDL2_DLL_PATH"] = os.path.abspath(os.path.join(
+			os.path.dirname(__file__), os.pardir, os.pardir, os.pardir))
+	elif os.name == "nt":
+		os.environ["PYSDL2_DLL_PATH"] = os.path.abspath(os.path.join(
+			os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin"))
+
 from .dll import get_dll_file, _bind
 from ctypes import c_int as _cint

--- sdl2/__init__.py
+++ sdl2/__init__.py
@@ -1,4 +1,16 @@
 """SDL2 wrapper package"""
+# Direct this module to Ana/Miniconda's lib folder, where the SDL2 libraries
+# can be found.
+import os
+
+if "PYSDL2_DLL_PATH" not in os.environ:
+	if os.name == "posix":
+		os.environ["PYSDL2_DLL_PATH"] = os.path.abspath(os.path.join(
+			os.path.dirname(__file__), os.pardir, os.pardir, os.pardir))
+	elif os.name == "nt":
+		os.environ["PYSDL2_DLL_PATH"] = os.path.abspath(os.path.join(
+			os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "Library", "bin"))
+
 from .dll import get_dll_file, _bind
 from ctypes import c_int as _cint

Change not ... in, to not in, in patch

Change not ... in, to not in, in patch


--- ../src-base/minecraft/net/minecraft/client/resources/LanguageManager.java
+++ ../src-work/minecraft/net/minecraft/client/resources/LanguageManager.java
@@ -3,6 +3,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import java.io.IOException;
@@ -83,6 +85,7 @@
         }

         field_135049_a.func_135022_a(p_110549_1_, arraylist);
+        LanguageRegistry.instance().loadLanguageTable(field_135049_a.field_135032_a, this.field_135048_c);
         StringTranslate.func_135063_a(field_135049_a.field_135032_a);
     }

--- ../src-base/minecraft/net/minecraft/client/resources/LanguageManager.java
+++ ../src-work/minecraft/net/minecraft/client/resources/LanguageManager.java
@@ -3,6 +3,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import java.io.IOException;
@@ -82,6 +84,7 @@
             arraylist.add(this.field_135048_c);
         }

+        LanguageRegistry.instance().loadLanguageTable(field_135049_a.field_135032_a, this.field_135048_c);
         field_135049_a.func_135022_a(p_110549_1_, arraylist);
         StringTranslate.func_135063_a(field_135049_a.field_135032_a);
     }

Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.


diff -aurN node-v0.8.18.orig/configure node-v0.8.18/configure
--- node-v0.8.18.orig/configure	2012-12-28 22:44:59.000000000 +0900
+++ node-v0.8.18/configure	2012-12-28 22:45:23.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python26
 import optparse
 import os
 import pprint

diff -aurN node-v0.8.18.orig/configure node-v0.8.18/configure
--- node-v0.8.18.orig/configure	2012-12-28 22:44:59.000000000 +0900
+++ node-v0.8.18/configure	2012-12-28 22:45:23.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python27
 import optparse
 import os
 import pprint

Update python version to python27

Update python version to python27

Fix in #35 is incomplete, this should get updated too.


diff -burN opencv.orig/cmake/OpenCVInstallLayout.cmake opencv/cmake/OpenCVInstallLayout.cmake
--- opencv.orig/cmake/OpenCVInstallLayout.cmake	2021-06-08 09:30:22.007336301 +0200
+++ opencv/cmake/OpenCVInstallLayout.cmake	2021-06-08 09:30:54.279376480 +0200
@@ -23,7 +23,7 @@
 elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)

   if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
-    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "") #"${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
   else()
     message(STATUS "Can't detect runtime and/or arch")
     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")

diff -burN opencv.orig/cmake/OpenCVInstallLayout.cmake opencv/cmake/OpenCVInstallLayout.cmake
--- opencv.orig/cmake/OpenCVInstallLayout.cmake	2021-06-08 09:30:22.007336301 +0200
+++ opencv/cmake/OpenCVInstallLayout.cmake	2021-06-08 09:30:54.279376480 +0200
@@ -23,7 +23,7 @@
 elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)

   if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
-    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+    ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") #"${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
   else()
     message(STATUS "Can't detect runtime and/or arch")
     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")

Update windows patch for openCV

BUG: Update windows patch for openCV


From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 18 Sep 2017 17:22:43 -0700
Subject: [PATCH] md: Fix build with musl

The MIPS specific header <sgidefs.h> is not provided by musl
linux kernel headers provide <asm/sgidefs.h> which has same definitions

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending

 pr/include/md/_linux.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index 640b19c..31296a8 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -499,7 +499,7 @@
 #elif defined(__mips__)

 /* For _ABI64 */
-#include <sgidefs.h>
+#include <asm/sgidefs.h>

 #ifdef __MIPSEB__
 #define IS_BIG_ENDIAN 1
--
2.14.1

From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 18 Sep 2017 17:22:43 -0700
Subject: [PATCH] md: Fix build with musl

The MIPS specific header <sgidefs.h> is not provided by musl
linux kernel headers provide <asm/sgidefs.h> which has same definitions

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending

 pr/include/md/_linux.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -499,7 +499,7 @@
 #elif defined(__mips__)

 /* For _ABI64 */
-#include <sgidefs.h>
+#include <asm/sgidefs.h>

 #ifdef __MIPSEB__
 #define IS_BIG_ENDIAN 1
@@ -511,7 +511,7 @@
 #error "Unknown MIPS endianness."
 #endif

-#if _MIPS_SIM == _ABI64
+#if _MIPS_SIM == _MIPS_SIM_ABI64

 #define IS_64

Use _MIPS_SIM_ABI64 instead of _ABI64

nspr: Use _MIPS_SIM_ABI64 instead of _ABI64

_ABI64 is glibc specific, to use a common define from asm/sgidefs.h will
work in every case

Signed-off-by: Khem Raj <729d64b6f67515e258459a5f6d20ec88b2caf8df@gmail.com>


--- ../src-base/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
+++ ../src-work/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
@@ -45,6 +45,10 @@
         return (EntityLiving.SpawnPlacementType)field_180110_a.get(p_180109_0_);
     }

+    public static void setPlacementType(Class<? extends Entity> entityClass, EntityLiving.SpawnPlacementType placementType)
+    {
+        if(!field_180110_a.contains(entityClass))
+            field_180110_a.put(entityClass, placementType);
+    }
+
     static
     {
         field_180110_a.put(EntityBat.class, EntityLiving.SpawnPlacementType.ON_GROUND);

--- ../src-base/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
+++ ../src-work/minecraft/net/minecraft/entity/EntitySpawnPlacementRegistry.java
@@ -45,6 +45,12 @@
         return (EntityLiving.SpawnPlacementType)field_180110_a.get(p_180109_0_);
     }

+    public static void setPlacementType(Class<? extends Entity> entityClass, EntityLiving.SpawnPlacementType placementType)
+    {
+        if(!field_180110_a.containsKey(entityClass))
+            field_180110_a.put(entityClass, placementType);
+    }
+
     static
     {
         field_180110_a.put(EntityBat.class, EntityLiving.SpawnPlacementType.ON_GROUND);

Fix compile error in ClientHax's PR.

Fix compile error in ClientHax's PR.


meta-clang passes this option to compiler defaults

Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>

--- a/klcc/klcc.in
+++ b/klcc/klcc.in
@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) {
     } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
 	# Override gcc encoded sysroot
 	push(@ccopt, $a);
+    } elsif ( $a eq '-nostartfiles' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-nostdlib' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-nodefaultlibs' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-no-pie' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-no-integrated-as' ) {
+	# Allow clang options
+	push(@ccopt, $a);
+    } elsif ( $a =~ '--unwindlib=.*' ) {
+	# Allow clang options
+	push(@ccopt, $a);
     } else {
 	die "$0: unknown option: $a\n";
     }

meta-clang passes this option to compiler defaults

Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>

--- a/klcc/klcc.in
+++ b/klcc/klcc.in
@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) {
     } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) {
 	# Override gcc encoded sysroot
 	push(@ccopt, $a);
+    } elsif ( $a eq '-nostartfiles' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-nostdlib' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-nodefaultlibs' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-no-pie' ) {
+        # Allow clang options
+        push(@ccopt, $a);
+    } elsif ( $a eq '-no-integrated-as' ) {
+	# Allow clang options
+	push(@ccopt, $a);
+    } elsif ( $a =~ '--unwindlib=.*' ) {
+	# Allow clang options
+	push(@ccopt, $a);
+    } elsif ( $a =~ '-rtlib=.*' ) {
+	# Allow clang options
+	push(@ccopt, $a);
     } else {
 	die "$0: unknown option: $a\n";
     }

Add clang's -rtlib to known options

klibc: Add clang's -rtlib to known options

This helps in ensuring that we always link klibc apps with libgcc as
compiler-rt does not work for klibc due to missing libssp functions e.g.
__stack_chk_guard and __stack_chk_guard which it expects in libc

Signed-off-by: Khem Raj <729d64b6f67515e258459a5f6d20ec88b2caf8df@gmail.com>
Cc: Andrea Adami <58a22b0beb8ec13ae546a060c8b4c576f22f6153@gmail.com>


--- .vscode/extensions/zobo.php-intellisense-1.0.6/vendor/felixfbecker/language-server/src/Indexer.php	2022-04-21 09:09:56.000000000 -0700
+++ .vscode/extensions/zobo.php-intellisense-1.0.6/vendor/felixfbecker/language-server/src/Indexer.php	2022-04-21 09:13:57.000000000 -0700
@@ -122,6 +122,16 @@
             $pattern = Path::makeAbsolute('**/*.php', $this->rootPath);
             $uris = yield $this->filesFinder->find($pattern);

+            $uris = array_filter($uris, fn($uri) => preg_match(sprintf('/%s/i', implode('|', [
+              '\.git',
+              'contrib',
+              'core',
+              'files',
+              'simpletest',
+              'tests',
+              'vendor',
+            ])), $uri) !== 1);
+
             $count = count($uris);
             $startTime = microtime(true);
             $this->client->window->logMessage(MessageType::INFO, "$count files total");

--- .vscode/extensions/zobo.php-intellisense-1.0.8/vendor/felixfbecker/language-server/src/Indexer.php	2022-05-22 10:11:29.000000000 -0700
+++ .vscode/extensions/zobo.php-intellisense-1.0.8/vendor/felixfbecker/language-server/src/Indexer.php	2022-05-22 10:10:46.000000000 -0700
@@ -122,6 +122,16 @@
             $pattern = Path::makeAbsolute('**/*.php', $this->rootPath);
             $uris = yield $this->filesFinder->find($pattern);

+            $uris = array_filter($uris, fn($uri) => preg_match(sprintf('/%s/i', implode('|', [
+              '\.git',
+              'contrib',
+              'core',
+              'files',
+              'simpletest',
+              'tests',
+              'vendor',
+            ])), $uri) !== 1);
+
             $count = count($uris);
             $startTime = microtime(true);
             $this->client->window->logMessage(MessageType::INFO, "$count files total");

Adjust the php lang server patch.

Adjust the php lang server patch.


From c0043fcc2bfacd10112a6e98b1216d3840566e9a Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Mon, 6 Feb 2017 12:05:49 +0900
Subject: [PATCH] appsrc: Clear EOS on flush

Flushing the pipeline should clear the EOS flag so that buffers may be
sent once again.
---
 gst-libs/gst/app/gstappsink.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index f6408d6..ca37465 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -595,6 +595,7 @@ gst_app_sink_event (GstBaseSink * sink, GstEvent * event)
       GST_DEBUG_OBJECT (appsink, "received FLUSH_STOP");
       gst_app_sink_flush_unlocked (appsink);
       g_mutex_unlock (&priv->mutex);
+      priv->is_eos = FALSE;
       break;
     default:
       break;
--
1.9.1

From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Thu, 28 Sep 2017 18:20:42 +0900
Subject: [PATCH] appsrc: Clear EOS on flush

The currently preferred method of flushing a pipeline is to use
the FLUSH_START/STOP events, but these events are input at the
source pad of the pipeline source, and therefore are not passed
to the source plugin callback.  Instead do the processing in the
event callback on the plugin source pad.
---
 gst-libs/gst/app/gstappsrc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index fff99e9..1bbe7b1 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -779,6 +779,7 @@ gst_app_src_send_event (GstElement * element, GstEvent * event)
     case GST_EVENT_FLUSH_STOP:
       g_mutex_lock (&priv->mutex);
       gst_app_src_flush_queued (appsrc, TRUE);
+      priv->is_eos = FALSE;
       g_mutex_unlock (&priv->mutex);
       break;
     default:
--
1.9.1

Correct appsrc EOS sending patch

Correct appsrc EOS sending patch

The previous patch was mistakenly applied to appsink instead of appsrc