updates for release 2.4.131, gone horribly wrong

diff --git a/kona/lib/full_jar_list.txt b/kona/lib/full_jar_list.txt
new file mode 100644 (file)
index 0000000..06650da
--- /dev/null
+++ b/kona/lib/full_jar_list.txt
@@ -0,0 +1,14 @@
+./commons-logging-api-1.1.1.jar
+./SizeOf.jar
+./commons-logging-1.1.1.jar
+./commons-logging-adapters-1.1.1.jar
+./log4j-1.2.16.jar
+./org.eclipse.osgi_3.8.0.v20120529-1548.jar
+./commons-compress-1.8.1.jar
+./commons-io-2.4.jar
+./ant-junit.jar
+./commons-logging-1.1.1-sources.jar
+./commons-logging-tests.jar
+./commons-logging-1.1.1-javadoc.jar
+./junit-4.5.jar
+./commons-lang3-3.5.jar

diff --git a/kona/lib/log4j-1.2.16.jar b/kona/lib/log4j-1.2.16.jar
deleted file mode 100644 (file)
index 3f9d847..0000000
Binary files a/kona/lib/log4j-1.2.16.jar and /dev/null differ

diff --git a/kona/log4j.properties b/kona/log4j.properties
index ef68572b65c76408607be4c244913b2889f61fe8..361aa5781b229d18d89702c38c3fe27d85a4825e 100644 (file)
--- a/kona/log4j.properties
+++ b/kona/log4j.properties
@@ -5,7 +5,9 @@ log4j.rootCategory=, TTY, LOGFILE
 log4j.appender.TTY=org.apache.log4j.ConsoleAppender\r
 log4j.appender.TTY.Threshold=DEBUG\r
 log4j.appender.TTY.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.TTY.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%-28c{2}] - %m%n\r
+log4j.appender.TTY.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%-28c{2}] - %m{nolookups}%n\r
+\r
+#NOTE: vulnerability with bare percent m style: https://news.ycombinator.com/item?id=29507263\r
 \r
 # LOGFILE is set to be a RollingFileAppender using a PatternLayout.\r
 log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender\r
@@ -14,5 +16,5 @@ log4j.appender.LOGFILE.MaxFileSize=10MB
 log4j.appender.LOGFILE.MaxBackupIndex=10\r
 log4j.appender.LOGFILE.Threshold=DEBUG\r
 log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%-28c{2}] - %m%n\r
+log4j.appender.LOGFILE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%-28c{2}] - %m{nolookups}%n\r
 \r

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 08c2c00c7daa5fc82f2082f9b56131c4610fa0c7..f77fd28c7e34544df8ffd2a694131a4255a19c01 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=130
+revision=131
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index c5a4f87daa7cc153a4d3d471a9c0d6e70e80ac67..463be9e066ab76d30541ba606e38bb62e9a6ce7b 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -76,6 +76,7 @@ if [ -z "$skip_all" ]; then
   # makes the status of pipe number N (passed as first parameter) into the
   # main return value (i.e., the value for $?).  this is super handy to avoid
   # repeating the awkward looking code below in multiple places.
+  # the numbering starts at zero, for the first item at the head of the pipe.
   function promote_pipe_return()
   {
     ( exit ${PIPESTATUS[$1]} )

diff --git a/scripts/multimedia/sound_play.sh b/scripts/multimedia/sound_play.sh
index 382d773852adfab8cca3a66c4c990127355efe05..8c5130efc69b0793e7199b9ca1abc29bbfa0dbaf 100644 (file)
--- a/scripts/multimedia/sound_play.sh
+++ b/scripts/multimedia/sound_play.sh
@@ -14,7 +14,7 @@ if [ ! -f "$PLAYCMD" ]; then
   PLAYCMD='echo Unknown sound player...'
 fi
 
-if [ ! -z "$(which afplay)" ]; then
+if [ ! -z "$(whichable afplay)" ]; then
 #echo we see afplay available...
   PLAYCMD=afplay
 elif [ ! -z "$(psfind artsd)" ]; then

diff --git a/walrus/utilities/multimedia/multimedia_tools.txt b/walrus/utilities/multimedia/multimedia_tools.txt
index e3dbb7942720a7749dcc00c0165ff2ca02a45dc6..51970c89030004f3ec05ddb16765b324dd904eb8 100644 (file)
--- a/walrus/utilities/multimedia/multimedia_tools.txt
+++ b/walrus/utilities/multimedia/multimedia_tools.txt
@@ -65,6 +65,10 @@ this article helps a lot to get the music off of vinyl records using a usb turnt
 movie processing
 ----------------
 
+kdenlive:
+  this is an awesome tool that lets you manage multiple tracks of audio and video, apply
+  effects to both, edit and remove pieces, insert tracks, etc.  it's great.
+
 avidemux:
   if you need to manipulate a video, for example to rotate it or transcode it to a different
   format, then avidemux works great.