diff --git a/autodist b/autodist index 169551a..3a637c5 100755 --- a/autodist +++ b/autodist @@ -5,7 +5,7 @@ # # Released under the terms of the GNU GPL release 3 license # -VERSION=0.9.7 +VERSION=0.9.8 me=(${0##*/} $VERSION "Sat Aug 20 2010") exec 3>`readlink /proc/self/fd/0` diff --git a/autodist-cgi b/autodist-cgi index 6f0a6c6..0ea8fe9 100755 --- a/autodist-cgi +++ b/autodist-cgi @@ -80,7 +80,7 @@ else for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do if [ "$SHOWLOG" = "monitor" ]; then echo "

Build hosts monitor

" - icecream-monitor localhost listcs | \ + icecream-monitor $ICECREAM_MONITOR_HOST listcs | \ while read line; do [ "${line:0:8}" = "200 done" ] && printon= if [ "$printon" ]; then diff --git a/autodist-upstream-updates b/autodist-upstream-updates index 731c54d..a83e922 100755 --- a/autodist-upstream-updates +++ b/autodist-upstream-updates @@ -181,8 +181,9 @@ parse_arch_linux() { while read line; do line=`echo $line | sed "s|.*href=\"\([^\"]*\)\">.*|\1|"` pkg=`echo $line | sed "s|\(.*\)-[^-]*-[^-]*-[^-]*|\1|"` - ver=`echo $line | sed "s|.*-\([^-]*\)-[^-]*-[^-]*|\1|"` + ver=`echo $line | sed "s|.*-\([^-]*\)-[^-]*-[^-]*|\1|;s|.*%3a||"` alias=`grep "^$pkg " $ALIASES_DB` + [ "$alias" ] || alias=`grep "^lib$pkg " $ALIASES_DB` [ "$alias" ] && pkgalias=${alias/* /} || pkgalias=$pkg line=`grep -i "^$pkgalias:" $buildstmp || grep -i "^lib$pkgalias:" $buildstmp || grep -i " $pkgalias[^-_A-Za-z0-9]" $buildstmp` diff --git a/autoport b/autoport index 8e19059..cec0449 100755 --- a/autoport +++ b/autoport @@ -4,7 +4,8 @@ # # Released under the terms of the GNU GPL release 3 license # -VERSION=0.9.7 +VERSION=0.9.8 + BASE_ARCH=i586 BASE_REPOSITORY=devel PORT_REPOSITORY=devel @@ -244,7 +245,7 @@ fetch_repfiles() { BUILD_ARCH=`uname -i` case $BUILD_ARCH in - i386|i486|i686) BUILD_ARCH=i586 ;; + i386|i486|i686) BUILD_ARCH=i586; BASE_ARCH=x86_64 ;; arm*) BUILD_ARCH=arm ;; esac diff --git a/etc/autodist/config b/etc/autodist/config index 534411b..fe511f7 100644 --- a/etc/autodist/config +++ b/etc/autodist/config @@ -8,14 +8,7 @@ SEND_SERVER=devel-autodist #WEBBUILD_EMAIL= #WEBBUILD_SECRET= WEBBUILD_STATEDIR=/var/webbuild -WEBBUILD_REPOSITORIES=(devel devel-games devel-kernel devel-kde4 devel-xorg devel-gnome devel-makedist \ - devel-java devel-misc devel-autodist devel-future devel-past \ - milestone1 milestone1-updates milestone1-games milestone1-1.1 milestone1-makedist \ - milestone2 milestone2-games milestone2-updates milestone2-kernel milestone2-kde4 \ - milestone2-xorg milestone2-makedist milestone2-java \ - devel-contrib devel-silvan devel-stefano devel-aleph0 devel-skiver devel-fabiog devel-gil \ - devel-distservers devel-the_packagizers devel-ercolinux \ - devel-contrib-java devel-michiamophil milestone1-java milestone1-contrib) +WEBBUILD_DISTROQUERY_URL="http://www.openmamba.org/cgi-bin/distroquery" AUTOBUILD_MAXNUM=200 AUTOBUILD_DATEFROM=20060601 AUTOBUILD_SKIP_DAYS=28 diff --git a/etc/autodist/distdb b/etc/autodist/distdb index 5bc3e46..987d952 100644 --- a/etc/autodist/distdb +++ b/etc/autodist/distdb @@ -83,6 +83,102 @@ kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n ) kde4=( +kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\ +nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\ +okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ +kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ +ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,sweeper,\ +jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\ +kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\ +libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\ +ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\ +klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\ +kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\ +amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,zeroconf-ioslave,kget,kopete,kppp,\ +krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\ +libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\ +kde-dev-utils,poxml,kdesdk-strigi-analyzers,kwalletmanager,baloo,kfilemetadata +%build_and_install,%continue_on_error +1,1 +) + +kde4123=( +kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\ +nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\ +okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ +kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ +ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,sweeper,\ +jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\ +kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\ +libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\ +ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\ +klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\ +kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\ +amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\ +krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\ +libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\ +kde-dev-utils,poxml,kdesdk-strigi-analyzers +%build_and_install,%continue_on_error +1,1 +) +# kwalletmanager + +kde4122=( +kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-wallpapers,kde-baseapps,\ +nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\ +okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ +kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ +ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\ +jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\ +kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\ +libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\ +ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\ +klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\ +kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\ +amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\ +krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\ +libkomparediff2,kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,\ +kde-dev-utils,poxml,kdesdk-strigi-analyzers +%build_and_install,%continue_on_error +1,1 +) + +kde411=( +kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,\ +nepomuk-widgets,kdepim,kdepim-runtime,libkdcraw,libkexiv2,kdeartwork,marble,\ +kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ +kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\ +klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libksane,\ +okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\ +kross-interpreters,PyKDE4,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\ +ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\ +jovie,kmousetool,kmouth,qyoto,kimono,kaccessible,kdegraphics-mobipocket,\ +libkcddb,libkcompactdisc,audiocd-kio,kscd,dragon,kmix,juk,print-manager,kdewebdev,\ +kde-base-artwork,ffmpegthumbs,kmag,mplayerthumbs,superkaramba,\ +libkdegames,bomber,bovo,granatier,kajongg,kapman,knavalbattle,katomic,kblackbox,kblocks,\ +ksnakeduel,kbounce,kbreakout,kdiamond,kfourinline,kgoldrunner,kigo,killbots,kiriki,kjumpingcube,\ +klickety,klines,libkmahjongg,kmahjongg,kmines,knetwalk,kolf,kollision,konquest,kpat,kshisen,\ +kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pairs,picmi,\ +amor,kteatime,ktux,kcron,ksystemlog,kuser,kdenetwork-filesharing,kdnssd,kget,kopete,kppp,\ +krdc,krfb,kdenetwork-strigi-analyzers,kdesdk-thumbnailers,cervisia,kcachegrind,kdesdk-kioslaves,\ +kompare,lokalize,okteta,dolphin-plugins,umbrello,kapptemplate,kde-dev-scripts,kde-dev-utils,poxml +%build_and_install,%continue_on_error +1,1 +) + +kde410=( kdelibs,kdepimlibs,oxygen-icons,nepomuk-core,kde-runtime,kactivities,kde-workspace,kde-wallpapers,kde-baseapps,\ nepomuk-widgets,kdepim4,kdepim-runtime,kdeadmin,kdenetwork,kdetoys,kdesdk,libkdcraw,libkexiv2,kdeartwork,marble,\ kdeplasma-addons,kde-l10n,blinken,libkipi,gwenview,libkdeedu,analitza,cantor,kalgebra,kalzium,kamera,\ @@ -101,7 +197,6 @@ kreversi,kspaceduel,ksquares,ksirk,ktuberling,kubrick,lskat,palapeli,ksudoku,pai %build_and_install,%continue_on_error 1,1 ) -# kdegames xfce4=( libxfce4util,libxfce4ui,xfce4-appfinder,xfce4-dev-tools,xfce4-panel,xfce4-session,xfce4-settings,xfconf,xfdesktop,xfwm4 @@ -128,11 +223,11 @@ netbeans-platform,netbeans 1 ) -firefox=( -xulrunner,firefox -%build_and_install -1 -) +#firefox=( +#xulrunner,firefox +#%build_and_install +#1 +#) xfce=( libxfce4util,xfconf,libxfcegui4,libxfce4ui,xfce-utils,xfce4-appfinder,xfce4-panel,xfce4-session,xfdesktop,xfwm4 @@ -147,6 +242,12 @@ libSimGear,FlightGear 1 ) +mythtv=( +mythtv,mythplugins +%build_and_install +1 +) + valknut=( libdc,valknut %build_and_install diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586 index 3e61d62..6ad3468 100644 --- a/etc/autodist/distdb.i586 +++ b/etc/autodist/distdb.i586 @@ -67,9 +67,9 @@ cross_target_cpu,_target_platform,disable_java i586,i586-openmamba-linux-gnu,- arm,arm-openmamba-linux-gnueabi,1 x86_64,x86_64-openmamba-linux-gnu,1 -ppc,ppc-openmamba-linux-gnu,1 avr,avr,1 ) +#ppc,ppc-openmamba-linux-gnu,1 # # XTC 6 diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm index 37d38cb..849d87d 100644 --- a/etc/autodist/unstage.arm +++ b/etc/autodist/unstage.arm @@ -42,3 +42,4 @@ python27 beecrypt ncurses tcltk85 +java-openjdk diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64 index d41cfed..101a84f 100644 --- a/etc/autodist/unstage.x86_64 +++ b/etc/autodist/unstage.x86_64 @@ -30,3 +30,12 @@ beecrypt gtk-doc tzdata db60 +ImageMagick +java-openjdk +java-gcj-compat +apache-log4j +java-icu4j4 +mpg123 +libgphoto +nfs-utils +git diff --git a/etc/sysconfig/autoport b/etc/sysconfig/autoport index 24b7a0f..9333077 100644 --- a/etc/sysconfig/autoport +++ b/etc/sysconfig/autoport @@ -2,8 +2,17 @@ # autoport global configuration # local_ftp=/var/ftp/pub/openmamba/ +#AUTOBUILDS_STATUS_URL="http://www.openmamba.org/distribution/autobuilds.html" #AUTOPORT_ENABLE=1 -#AUTOPORT_CGI_HOST=(http://localhost/cgi-bin/autodist http://arm-sdk/cgi-bin/autodist) +#AUTOPORT_CGI_HOST=(http://localhost/cgi-bin/autodist http://192.168.0.100/cgi-bin/autodist) + +AUTOPORT_DEVEL_IMPORT_REPOSITORIES="devel-makedist devel devel-games devel-autodist devel-gnome \ +devel-kde4 devel-xorg devel-kernel devel-misc devel-java devel-future devel-past devel-contrib devel-contrib-java" + +AUTOPORT_DEVEL_RELEASE_REPOSITORIES="milestone2-makedist milestone2-kernel milestone2-kernel-next" + +AUTOPORT_MILESTONE2_IMPORT_REPOSITORIES="milestone2-makedist milestone2-updates milestone2-kernel \ +milestone2-kde4 milestone2-xorg milestone2-kernel-next milestone2" #AUTOPORT_ARCH[0]=x86_64 #AUTOPORT_DISABLE[0]= @@ -13,6 +22,8 @@ local_ftp=/var/ftp/pub/openmamba/ #AUTOPORT_CROSS[0]= #AUTOPORT_NATIVE[0]= #AUTOPORT_REPOSITORIES[0]="devel-makedist" +#AUTOPORT_BASE_REPOSITORY[0]="devel-makedist" +#AUTOPORT_IMPORT_REPOSITORIES[0]="$AUTOPORT_DEVEL_IMPORT_REPOSITORIES" #AUTOPORT_ARCH[1]=i586 #AUTOPORT_DISABLE[1]= @@ -21,5 +32,7 @@ local_ftp=/var/ftp/pub/openmamba/ #AUTOPORT_CHROOT_ICECREAM[1]=1 #AUTOPORT_CROSS[1]= #AUTOPORT_NATIVE[1]= +#AUTOPORT_BASE_REPOSITORY[0]="devel-autodist" #AUTOPORT_REPOSITORIES[1]="milestone2-makedist" -AUTOPORT_CGI_HOST=(http://localhost/cgi-bin/autodist http://192.168.0.100/cgi-bin/autodist) +#AUTOPORT_BASE_REPOSITORY[0]="milestone2-makedist" +#AUTOPORT_IMPORT_REPOSITORIES[0]="$AUTOPORT_DEVEL_IMPORT_REPOSITORIES" diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index 553e03d..6912698 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -1,7 +1,7 @@ #!/bin/bash # # webbuild cgi script -# Copyright (c) 2012-2013 by Silvan Calarco +# Copyright (c) 2012-2014 by Silvan Calarco # . /usr/share/autodist/webbuild-functions . /usr/share/autodist/webbuild-functions-private @@ -461,7 +461,7 @@ if [ "$REQUEST" = "repsearch" ]; then echo -n "Search results for \"$REPSEARCHTEXT\":
" # echo -n "
"
-   curl -s "http://test.openmamba.org/cgi-bin/distroquery?query=$REPSEARCHTEXT&search_milestone2=true&search_devel=true\
+   curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$REPSEARCHTEXT&search_milestone2=true&search_devel=true\
 &search_i586=true&search_x86_64=true&search_arm=true&search_sources=true&query_compact=true&replyplain=true"
 #   $SUDO_WRAPPER 0 local "$USER" "" "openmamba-repository search -i ${REPSEARCHTEXT/-/\-}" | \
 #      parse_search_output ${AUTOPORT_ARCH[$ENVIRONMENT]}
@@ -886,16 +886,14 @@ if [ "$MAINTAINERMODE" = "true" -o ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
       SRPMBUTTONDISABLED="disabled=disabled"
       if [ -e $local_ftp/$REPOSITORY ]; then
          if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
-            ls $local_ftp/$REPOSITORY/SRPMS.base/*.src.rpm | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+            ls $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
          fi
       else
          curl $REPS_BASE_URL/$REPOSITORY/SRPMS.base/ | grep .src.rpm | \
             sed "s|.*\.src\.rpm\">\(.*\).*|\1|" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
       fi
       while read f; do
-#         [ -r $f ] || continue
-         pkgname=`basename $f`
-         pkgname=${pkgname%.src.rpm}
+         pkgname=${f%.src.rpm}
          pkgrel=${pkgname/*-}
          pkgname=${pkgname%-$pkgrel}
          pkgver=${pkgname/*-}
@@ -2108,10 +2106,11 @@ if [ "$MAINTAINERMODE" = "true" ]; then
 #      echo ""
       echo -n ""
       echo -n "
"
-      ls $local_ftp/$REPOSITORY/SRPMS.base/*.src.rpm | sort -f | while read f; do
-         [ -r $f ] || continue
-         pkgname=`basename $f`
-         pkgname=${pkgname/.src.rpm}
+      if [ $local_ftp/$REPOSITORY/SRPMS.base -nt $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY ]; then
+         ls $local_ftp/$REPOSITORY/SRPMS.base/ | grep ".src.rpm$" | sort -f > $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
+      fi
+      while read f; do
+         pkgname=${f/.src.rpm}
          pkgrel=${pkgname/*-}
          pkgname=${pkgname/-$pkgrel}
          pkgver=${pkgname/*-}
@@ -2123,7 +2122,7 @@ if [ "$MAINTAINERMODE" = "true" ]; then
             SELECTED=
          fi
          echo -n ""
-      done
+      done < $WEBBUILD_STATEDIR/cache/repository-src-$REPOSITORY
       echo -n "
"
       echo -n "Origin: $REPOSITORY"
       # repository sync