Merge remote-tracking branch 'upstream/master'

ts/bin/gitignore

@@ -22,7 +22,7 @@ done
 update -c -d -t | sed -e "s/rm [-f ]*//" -e "s/\/\//\//g" >> /.gitignore
 update -c -d -k | sed -e "s/rm [-rf ]*/$TSWRKNGSED\//" -e "s/\/\//\//g" >> /.gitignore
 
-for i in share home usr/ROX usr/var man bin boot dev etc include lib lib64 mnt opt proc root sbin sys tmp var ts/components www usr/{swat,private,bin,etc,include,lib,lib64,man,sbin,share,src,local,libexec} ;
+for i in share home man bin boot dev etc include lib lib64 mnt opt proc root sbin sys tmp var ts/components www usr ;
   do
   echo "/$i" >> /.gitignore
 done

ts/build/packages/aufs/etc/rc0.d/00aufs

@@ -1,6 +1,7 @@
 modprobe aufs
 mount -t proc proc /proc
 mount -t tmpfs tmpfs /mnt/dynamic
+chmod 755 /mnt/dynamic
 mount -t aufs -o br:/mnt/dynamic:/=ro none /mnt/union
 cd /mnt/union
 mkdir oldroot

ts/build/packages/ica/build/extra/etc/init.d/ica.init

@@ -17,6 +17,11 @@ if ! pkg_initialized $PACKAGE; then
  APPSRV_CUSTOM=/tmp/appsrv.ini.new
  WFCLIENT_CUSTOM=/tmp/wfclient.ini.new
 
+ if [ -n "$PKCS11_MODULE" ]; then
+   awk -v pkcs="$PKCS11_MODULE" '{ print $0; if($1 == "<key>PKCS11module</key>") { getline; print "<value>" pkcs "</value>"} }' < $ICA_DIR/AuthManConfig.xml > $ICA_DIR/AuthManConfig.old
+   mv $ICA_DIR/AuthManConfig.old $ICA_DIR/AuthManConfig.xml
+ fi
+
  # Create the user config directory if it doesn't exist
  if [ ! -e $ICA_CONF ] ; then mkdir -p $ICA_CONF ; fi
 

ts/build/packages/iphone/.dna

@@ -1,10 +1,10 @@
 libimobiledevice,idevice_id,0,0,bin,1,,,,,,,,,
 libimobiledevice,idevicepair,0,0,bin,1,,,,,,,,,
-usbmuxd,iproxy,0,0,bin,1,,,,,,,,,
+libusbmuxd,iproxy,0,0,bin,1,,,,,,,,,
 libimobiledevice,ideviceinfo,0,0,bin,1,,,,,,,,,
 usbmuxd,usbmuxd,0,0,sbin,1,,,,,,,,,
-libimobiledevice,libimobiledevice.so.1.0.5,0,0,lib,1,lib/libimobiledevice.so.1,lib/libimobiledevice.so,,,,,,,
-,85-usbmuxd.rules,0,0,lib/udev/rules.d,0,,,,,,,,,
-usbmuxd,libusbmuxd.so.1.0.7,0,0,lib,1,lib/libusbmuxd.so.1,lib/libusbmuxd.so,,,,,,,
+libimobiledevice,libimobiledevice.so.6.0.0,20,0,lib,1,lib/libimobiledevice.so.6,lib/libimobiledevice.so,,,,,,,
+usbmuxd,39-usbmuxd.rules,0,0,lib/udev/rules.d,1,,,,,,,,,
+libusbmuxd,libusbmuxd.so.4.0.0,14,0,lib,1,lib/libusbmuxd.so.4,lib/libusbmuxd.so,,,,,,,
 ,finalize,0,0,build,0,,,,,,,,,
 ,dependencies,0,0,,0,,,,,,,,,

ts/build/packages/libreoffice/build/install

@@ -28,7 +28,9 @@ if [ -n "$1" ]; then
   cd ..
 
   mkdir -p $installdir/lib
-  mv $installdir/usr/bin $installdir/bin
+  if [ -d $installdir/usr/bin ]; then
+    mv $installdir/usr/bin $installdir/bin
+  fi
   mv $installdir/usr/share/* $installdir/lib
   rm -rf $installdir/usr
 
@@ -41,12 +43,12 @@ fi
 
 optname=`basename $installdir/opt/libreoffice*`
 
-rm -rf $installdir/lib/{applnk,mimelnk}
+rm -rf $installdir/lib/{applnk,mimelnk,mime-info,application-registry}
 rm -rf $installdir/lib/icons/gnome
 rm -rf $installdir/lib/man
-mv $installdir/opt/libreoffice*/share/config/images_tango.zip /tmp
-rm -rf $installdir/opt/libreoffice*/share/config/images*.zip
-mv /tmp/images_tango.zip $installdir/opt/libreoffice*/share/config
+mv $installdir/opt/$optname/share/config/images_tango.zip /tmp
+rm -rf $installdir/opt/$optname/share/config/images*.zip
+mv /tmp/images_tango.zip $installdir/opt/$optname/share/config
 
 ln -s ../opt/$optname/LICENSE $installdir/build/license
 mkdir -p $installdir/lib/licenses/libreoffice
@@ -55,10 +57,19 @@ ln -s /opt/$optname/LICENSE $installdir/lib/licenses/libreoffice
 mkdir -p $installdir/lib/mozilla/plugins
 ln -s /opt/$optname/program/libnpsoplugin.so $installdir/lib/mozilla/plugins
 
+if [ ! -d $installdir/lib/applications ]; then
+  mkdir -p $installdir/lib/applications
+  pushd $installdir/opt/$optname/share/xdg
+  for i in *; do
+    mv $i ../../../../lib/applications/libreoffice-$i
+  done
+  popd
+fi
+
 mkdir -p $installdir/lib/menu
 icon=`basename $installdir/lib/icons/hicolor/32x32/apps/libreoffice*-main.png | sed -e 's/\.png//'`
 cat > $installdir/lib/menu/libreoffice <<EOF
-package="libreoffice"; icon="$icon"; needs="x11"; title="LibreOffice"; command="libreoffice4.3"
+package="libreoffice"; icon="$icon"; needs="x11"; title="LibreOffice"; command="libreoffice"
 EOF
 
 cp -a $installdir/build/extra/* $installdir
@@ -73,9 +84,10 @@ find $installdir -name libavmediagst_0_10.so -delete
 find $installdir -name libgconfbe1lo.so -delete
 find $installdir -name libucpgvfs1lo.so -delete
 
-#if [ ! -e $installdir/bin/libreoffice ]; then
-#  binname=`basename $installdir/bin/libreoffice*`
-#  ln -s $binname $installdir/bin/libreoffice
-#fi
+if [ ! -d $installdir/bin ]; then
+  mkdir -p $installdir/bin
+  ln -s /opt/$optname/program/soffice $installdir/bin/$optname
+  ln -s $optname $installdir/bin/libreoffice
+fi
 
 exit $returnval

ts/build/packages/modemmanager/.dna

@@ -1,4 +1,4 @@
 ,remove,0,0,build,0,,,,,,,,,
-networkmanager,nm-pppd-plugin.so,0,0,build/extra/lib/pppd/2.4.5,1,,,,,,,,,
+networkmanager,nm-pppd-plugin.so,0,0,build/extra/lib/pppd/2.4.7,1,,,,,,,,,
 ,install,0,0,build,0,,,,,,,,,
 ,dependencies,0,0,,0,,,,,,,,,

ts/build/packages/modemmanager/.gitignore

@@ -1,4 +1,6 @@
 /build/installed
+/bin/
 /etc/
 /lib/
+/libexec/
 /sbin/

ts/build/packages/modemmanager/build/install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export PACKAGE=modemmanager
-export PORTS=$PACKAGE
+export PORTS="$PACKAGE libqmi libmbim"
 repackage -e
 
 returnval=$?

ts/build/packages/networkmanager/build/install

@@ -4,7 +4,7 @@ export PACKAGE=networkmanager
 export PORTS="$PACKAGE networkmanager-applet mobile-broadband-provider-info openresolv"
 export CREATE_EMPTY_DIRS="lib/NetworkManager"
 export DROP_FILES=nm-applet.desktop
-export DROP_DIRS=etc/rc.d
+export DROP_DIRS="etc/rc.d lib/pppd"
 repackage -e
 
 returnval=$?

ts/build/packages/ppp/.dna

@@ -1,18 +1,3 @@
-ppp,pppoe-discovery,0,0,sbin,1,,,,,,,,,
-ppp,chat,0,0,sbin,1,,,,,,,,,
-ppp,pppdump,0,0,sbin,1,,,,,,,,,
-ppp,pppd,0,0,sbin,1,,,,,,,,,
-ppp,pppstats,0,0,sbin,1,,,,,,,,,
-ppp,passwordfd.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,winbind.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,radius.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,radrealms.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,rp-pppoe.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,pppoatm.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,passprompt.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,minconn.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,radattr.so,0,0,lib/pppd/2.4.5,1,,,,,,,,,
-ppp,pap-secrets,0,0,etc/ppp,1,,,,,,,,,
-ppp,options,0,0,etc/ppp,1,,,,,,,,,
-ppp,chap-secrets,0,0,etc/ppp,1,,,,,,,,,
 ,dependencies,0,0,,0,,,,,,,,,
+,remove,0,0,build,0,,,,,,,,,
+,install,0,0,build,0,,,,,,,,,

ts/build/packages/ppp/.gitignore

@@ -0,0 +1,4 @@
+/etc/
+/lib/
+/sbin/
+/build/installed

ts/build/packages/ppp/build/install

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export PACKAGE=ppp
+export PORTS="$PACKAGE"
+repackage -e
+
+returnval=$?
+
+exit $returnval

ts/build/packages/ppp/build/remove

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export PACKAGE=ppp
+repackage -c

ts/build/packages/system-config-date/build/install

@@ -3,9 +3,9 @@
 INSTALLDIR=./packages/system-config-date
 TMPDIR=./build-scd
 
-for i in system-config-date glibc; do
+for i in system-config-date tzdata; do
 	repackage $i -t $TMPDIR
-	if [ $i == glibc ]; then
+	if [ $i == tzdata ]; then
 	  mkdir -p $INSTALLDIR/lib
 	  cp -Prf $TMPDIR/$i/lib/zoneinfo $INSTALLDIR/lib
 	else

ts/build/packages/totem/build/extra/etc/cmd/totem.global

@@ -0,0 +1 @@
+CMD_GLOBAL="totem"

ts/build/packages/totem/build/extra/etc/init.d/totem

@@ -0,0 +1 @@
+/etc/thinstation.packages

ts/build/packages/totem/build/extra/lib/menu/totem

@@ -0,0 +1 @@
+package="totem"; needs="x11"; title="Media Player"; menu="Multimedia"; command="totem"; nodesktop="true"

ts/build/packages/totem/build/extra/lib/pixmaps/totem_16x16.xpm

@@ -0,0 +1,183 @@
+/* XPM */
+static char *totem_16x16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 161 2 ",
+"   c #273036",
+".  c #2E3436",
+"X  c #2F3537",
+"o  c #253039",
+"O  c #25303A",
+"+  c #2F373D",
+"@  c #323A3F",
+"#  c #0F2442",
+"$  c #102747",
+"%  c #162F54",
+"&  c #343C41",
+"*  c #353E44",
+"=  c #1A3B6A",
+"-  c #203D64",
+";  c #3D4347",
+":  c #3D4446",
+">  c #3B4349",
+",  c #3A434A",
+"<  c #3A434B",
+"1  c #3A444A",
+"2  c #3A444B",
+"3  c #3B444B",
+"4  c #3C444B",
+"5  c #3B444C",
+"6  c #3B454C",
+"7  c #3C464E",
+"8  c #3D464E",
+"9  c #3C464F",
+"0  c #3E484F",
+"q  c #344250",
+"w  c #354351",
+"e  c #3E4A54",
+"r  c #1D457F",
+"t  c #22477B",
+"y  c #21477D",
+"u  c #294B7B",
+"i  c #404546",
+"p  c #464947",
+"a  c #414648",
+"s  c #40484F",
+"d  c #474C4E",
+"f  c #474D4F",
+"g  c #414A52",
+"h  c #414B52",
+"j  c #494F54",
+"k  c #475056",
+"l  c #4A5154",
+"z  c #4F5558",
+"x  c #4D555B",
+"c  c #535652",
+"v  c #565A5C",
+"b  c #595A58",
+"n  c #5E5F5C",
+"m  c #5F605D",
+"M  c #515A60",
+"N  c #57626B",
+"B  c #5E6872",
+"V  c #616361",
+"C  c #626666",
+"Z  c #676966",
+"A  c #626769",
+"S  c #60666A",
+"D  c #6B6C69",
+"F  c #6C6D6A",
+"G  c #6F716C",
+"H  c #70716E",
+"J  c #71736F",
+"K  c #72736F",
+"L  c #666C70",
+"P  c #666C72",
+"I  c #6F757A",
+"U  c #6F777C",
+"Y  c #727370",
+"T  c #737470",
+"R  c #797A76",
+"E  c #73797E",
+"W  c #7C7D7A",
+"Q  c #264C83",
+"!  c #214C88",
+"~  c #224C8A",
+"^  c #244D88",
+"/  c #27518D",
+"(  c #375F93",
+")  c #335F98",
+"_  c #345F98",
+"`  c #34609E",
+"'  c #3562A5",
+"]  c #3664A6",
+"[  c #3965A2",
+"{  c #3F6AA2",
+"}  c #556F91",
+"|  c #6A7683",
+" . c #66778D",
+".. c #7B7F81",
+"X. c #416DA3",
+"o. c #406AA6",
+"O. c #416CA5",
+"+. c #436EA5",
+"@. c #436FA5",
+"#. c #446EA6",
+"$. c #446FA7",
+"%. c #4571A8",
+"&. c #4974AB",
+"*. c #4873AC",
+"=. c #4975AD",
+"-. c #4D79B1",
+";. c #4C78B2",
+":. c #4C79B2",
+">. c #4D79B6",
+",. c #507DB2",
+"<. c #7D8080",
+"1. c #5C83BE",
+"2. c #5C85BE",
+"3. c #5F89C1",
+"4. c #628BC1",
+"5. c #638DC4",
+"6. c #7297C6",
+"7. c #7598C7",
+"8. c #7297C9",
+"9. c #848681",
+"0. c #8B8C8A",
+"q. c #898C8C",
+"w. c #8B8D8E",
+"e. c #8C8F8E",
+"r. c #8F9191",
+"t. c #919393",
+"y. c #8895A5",
+"u. c #8496AD",
+"i. c #A5A6A5",
+"p. c #A7AAAB",
+"a. c #B0B1AF",
+"s. c gray70",
+"d. c #B6B7B5",
+"f. c #91A6C2",
+"g. c #93ABC7",
+"h. c #95ADCA",
+"j. c #97ADCB",
+"k. c #97AECC",
+"l. c #8AA8D2",
+"z. c #91ABD0",
+"x. c #9AB3D1",
+"c. c #9CB4D2",
+"v. c #C2C3C0",
+"b. c #CECECE",
+"n. c #D7D7D7",
+"m. c gray87",
+"M. c #DFDFDF",
+"N. c #E2E1E2",
+"B. c gray89",
+"V. c gray90",
+"C. c #EBEBEA",
+"Z. c gray92",
+"A. c #EEEEEE",
+"S. c #F1F2F1",
+"D. c #F2F2F1",
+"F. c gray96",
+"G. c gray99",
+"H. c #FDFDFD",
+"J. c #FEFEFE",
+"K. c white",
+"L. c None",
+/* pixels */
+"L.L.L.L.m D Y . p , $.t $ = &.3 ",
+"L.L.n G v.S.K.. K., ! { $.@./ , ",
+"L.n R C.K.K.K.. c ; q q q q q : ",
+"L.G C.K.K.K.K.. K., ) X.X.@._ , ",
+"m v.K.K.K.K.b.. C ; O.! $ ( ,., ",
+"D S.K.K.K.i.H . D.e O.~ - Q O.> ",
+"Y K.K.K.b.H L.. D 6 =.^ % y *.> ",
+"H K.K.K.b.9.L.. L.5 [ -.-.-.` 5 ",
+"H G.K.K.b.H L.. 0.a 9 9 5 9 9 : ",
+"D D.K.K.K.s.K . D.s ] 3.5.3.] 5 ",
+"m v.K.K.B.m.F.. W g 4.{ u >.8.g ",
+"L.H C.n.m.B.V.. C.N 7.1.} 7.l.x ",
+"L.b V . . . . . X X @ 6  .z.B M ",
+"L.f z y.f.j.j.u.<.W e.r.f l | k ",
+". A L U E E B z v d.  U t.w.L j ",
+". p.h.x.x.g.0.A a.a O O + & * L."
+};