From 02f9a191170e2bd31c9fbcebced184a1e6b60c45 Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Tue, 26 Apr 2011 17:36:31 -0400 Subject: [PATCH] Various updates --- nodes.ia | 11 ++++++ packages.ia | 112 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 82 insertions(+), 41 deletions(-) diff --git a/nodes.ia b/nodes.ia index a882985..a98b264 100644 --- a/nodes.ia +++ b/nodes.ia @@ -40,6 +40,9 @@ profiles csclub server machine sparc general-use squeeze; @acesulfame-potassium profiles csclub server machine i386 general-use squeeze; +@sid +profiles csclub server container amd64 general-use wheezy; + # Computer Science Club Servers (Restricted) @glomag @@ -68,6 +71,14 @@ profiles csclub server machine armel squeeze general-small; @paza profiles csclub server machine powerpc squeeze general-small; +# unrestricted but too slow for general-use +@xinon +profiles csclub server machine powerpc squeeze general-small; + +# unrestricted but too slow for general-use +@rainbowdragoneyes +profiles csclub server machine mipsel squeeze general-small; + # Computational Math Club Office Terminals @inkpen diff --git a/packages.ia b/packages.ia index e0f1c6e..cb4ad85 100644 --- a/packages.ia +++ b/packages.ia @@ -1,4 +1,4 @@ -# vim:tw=74:sw=4 +# vim:tw=78:sw=4 if @core { @@ -21,7 +21,7 @@ if @core { # network install iputils-ping iputils-arping traceroute telnet iproute ethtool dnsutils whois wget netcat-openbsd netcat6 - ntp vlan bridge-utils tcpdump tshark + @!container ntp vlan bridge-utils tcpdump tshark ftp tftp; # package management @@ -53,7 +53,8 @@ if @core { if @machine { install lm-sensors smartmontools hwinfo lshw @armel mtd-utils @x86 acpid @x86 acpi @x86 @!lucid @!maverick acpi-support-base - @!sparc @!mips @!alpha kexec-tools; + @!sparc @!mips @!alpha @!mipsel kexec-tools @x86 vbetool fbset + @x86 read-edid; @amd64 install linux-image-amd64/linux-image; @i386 install linux-image-686/linux-image; @@ -65,7 +66,7 @@ if @machine { # container (virtual server) if @container { - remove udev initramfs-tools pm-utils radeontool acpid; + remove udev initramfs-tools pm-utils radeontool acpid ntp; }; if @auth-core { @@ -126,21 +127,21 @@ if @devel-full { byacc kelbt lemon bnfc jflex jlex re2c bisonc++ python-ply python-pyparsing btyacc @!alpha mono-jay pccts kimwitu kimwitu-doc kimwitu++ menhir racc wyg - @i386/amd64/powerpc @!squeeze ml-yacc @!alpha coco-cpp @!alpha + @i386/amd64/powerpc @!squeeze @!wheezy ml-yacc @!alpha coco-cpp @!alpha coco-cs @!alpha coco-java coco-doc cup javacc javacc-doc python-yappy yapps2 styx styx-dev styx-doc liblua5.1-lpeg-dev - @!lucid @!maverick @!squeeze cl-yacc; + @!lucid @!maverick @!squeeze @!wheezy cl-yacc; # build systems - install make-doc ccache @!lenny distcc ant ant-optional @!squeeze bake scons qt4-qmake + install make-doc ccache @!lenny distcc ant ant-optional @!squeeze @!wheezy bake scons qt4-qmake autogen autoconf-doc autoconf2.13 automake1.9 automake1.9-doc autotools-dev autoproject kbuild; # version control install git-core git-email git-cvs git-svn git-arch git-doc git-buildpackage guilt stgit @!lenny topgit mercurial subversion subversion-tools - @!lucid @!maverick @!squeeze svk darcs bzr bzrtools rcs cvs cvsps cssc tla tla-doc diff wdiff + @!lucid @!maverick @!squeeze @!wheezy svk darcs bzr bzrtools rcs cvs cvsps cssc tla tla-doc diff wdiff colordiff xxdiff tkdiff patch patchutils quilt tig diffstat pristine-tar @x86 monotone @@ -165,7 +166,7 @@ if @devel-full { install doxygen exuberant-ctags; # editing - install jde indent; + install @!wheezy jde indent; # c/c++ install cutils stl-manual bcc; @@ -174,7 +175,7 @@ if @devel-full { install openjdk-6-jdk; # haskell - install ghc6 ghc6-doc @!lucid @!maverick @!squeeze haskell-utils hugs hmake haskell-mode + install ghc6 ghc6-doc @!lucid @!maverick @!squeeze @!wheezy haskell-utils hugs hmake haskell-mode @!lenny haskell-platform; # ocaml @@ -186,8 +187,9 @@ if @devel-full { # python install python-all-dev python-m2crypto python-mysqldb python-imaging python-libxml2 python-libxslt1 python-numpy - python-numpy-doc python-twisted python-support @!squeeze python-numeric - python-openssl python-pexpect python-pgsql python-pyasn1 + python-numpy-doc python-twisted python-support + @!squeeze @!wheezy python-numeric + python-openssl python-pexpect @!wheezy python-pgsql python-pyasn1 python-pysnmp4 python-sqlobject python-subversion python-tk python-urwid python-xmpp drpython ipython pylint pychecker pyflakes python-beautifulsoup python-chardet python-clientform @@ -198,11 +200,11 @@ if @devel-full { @x86 jython @x86 jython-doc; # ruby - install ruby ruby-dev rubygems @!squeeze @!maverick irb rake ruby1.9/ruby1.9.1 + install ruby ruby-dev rubygems @!squeeze @!maverick @!wheezy irb rake ruby1.9/ruby1.9.1 ruby1.9-dev/ruby1.9.1-dev; # llvm - install llvm llvm-dev + install @!lenny clang llvm llvm-dev @x86 llvm-gcc-4.2; # scheme @@ -222,13 +224,13 @@ if @devel-full { install swig gawk mawk m4; # misc languages - install gfortran gforth gnat gobjc gobjc++ gpc erlang erlang-dev beef + install gfortran gforth gnat gobjc gobjc++ @!wheezy gpc erlang erlang-dev beef intercal/clc-intercal php5-cli rhino iconx @i386/amd64 sbcl - @!sparc clisp @i386/amd64/powerpc @!squeeze smlnj; + @!sparc clisp @i386/amd64/powerpc @!squeeze @!wheezy smlnj; # AVR toolchain install gcc-avr binutils-avr gdb-avr avrdude avrdude-doc simulavr - @!squeeze ava avarice avr-libc avra avrp uisp usbprog + @!squeeze @!wheezy ava avarice avr-libc avra avrp uisp usbprog @!lenny @!sparc avrprog; # development libraries @@ -246,7 +248,7 @@ if @devel-full { libssl-dev libxml2-dev libxslt1-dev ss-dev mesa-common-dev uuid-dev libprotobuf-c0-dev libprotobuf-dev @amd64 ia32-libs libffi-dev libidl-dev libelf-dev libdw-dev - libaudit-dev @!lenny @!maverick @!squeeze libnew-dev + libaudit-dev @!lenny @!maverick @!squeeze @!wheezy libnew-dev libsigc++-dev @amd64/i386 libbullet-dev; # X development libraries @@ -291,7 +293,7 @@ if @general-use { # network install ipset ipcalc iftop nmap openipmi @x86 ipmitool cdpr lksctp-tools - iptables ebtables arptables tsocks + iptables ebtables arptables tsocks @!lenny freeipmi-tools lftp ncftp @X wireshark; @@ -304,7 +306,8 @@ if @general-use { @X lyx; # filesystems - install fuse-utils sshfs davfs2 cloop-utils; + @!container + install fuse-utils sshfs davfs2 cloop-utils @x86/powerpc fuseext2; # printing install ghostscript psutils @@ -317,7 +320,7 @@ if @general-use { # compression install unzip unrar sharutils cabextract p7zip p7zip-full p7zip-rar - arj unace ncompress zoo xdelta; + arj unace ncompress zoo xdelta bsdtar bsdcpio; # ssh install pssh @X clusterssh dsh; @@ -330,17 +333,38 @@ if @general-use { install aspell-en ispell myspell-en-us iamerican wamerican; # emacs - install emacs-jabber @!squeeze gnus ede + install emacs-jabber @!squeeze @!wheezy gnus @!wheezy ede @!karmic @!lucid @!maverick tuareg-mode @!karmic @!lucid @!maverick ocaml-mode - @X @!squeeze @!maverick xemacs21 + @X @!squeeze @!maverick @!wheezy xemacs21 @X emacs22-gtk @!X emacs22-nox/emacs23-nox; # math - install graphviz octave3.2/octave3.0 octave3.2-doc/octave3.0-doc - octave3.2-emacsen/octave3.0-emacsen octave3.2-headers/octave3.0-headers - r-recommended euler euler-doc gnuplot gnuplot-doc + install graphviz r-recommended euler euler-doc gnuplot gnuplot-doc gap lp-solve mathomatic maxima maxima-doc - @X gnuplot-x11 @amd64 @!squeeze @!maverick xppaut; + @X gnuplot-x11 @amd64 @!squeeze @!maverick @!wheezy xppaut + @X rocs; + + # octave + install octave3.2/octave3.0 octave3.2-doc/octave3.0-doc + octave3.2-emacsen/octave3.0-emacsen + octave3.2-headers/octave3.0-headers; + @!lenny + install octave-ad octave-audio octave-benchmark octave-bim + octave-combinatorics octave-communications-common + octave-communications octave-control octave-data-smoothing + octave-econometrics octave-epstk octave-financial octave-fixed octave-fpl + octave-ftp octave-ga octave-general octave-gsl octave-ident octave-image + octave-informationtheory octave-integration octave-io octave-irsa + octave-linear-algebra octave-mapping octave-miscellaneous + octave-missing-functions octave-msh octave-multicore octave-nan + octave-nlwing2 octave-nnet octave-nurbs octave-ocs octave-octcdf + octave-octgpr octave-odepkg octave-optim octave-optiminterp + octave-outliers octave-parallel octave-pdb + octave-pkg-dev octave-plot octave-secs1d octave-secs2d octave-signal + octave-simp octave-sockets octave-specfun octave-splines octave-statistics + octave-strings octave-struct octave-symband octave-symbolic octave-time + octave-tsa octave-vrml octave-zenity octave-pfstools + octave-plplot octave-sp; # xml install xsltproc libxml2-utils docbook-xsl docbook-utils docbook-dsssl @@ -348,9 +372,11 @@ if @general-use { sp tidy xalan; # multimedia - install mplayer @!container festival ffmpeg dvd+rw-tools dvgrab @!squeeze dvdrip - @!squeeze lame twolame @audio timidity - cdrdao cdparanoia genisoimage sox mp3blaster @!squeeze x264 mkvtoolnix + install mplayer @!container festival ffmpeg dvd+rw-tools dvgrab + @!squeeze @!wheezy dvdrip + @!squeeze @!wheezy lame twolame @audio timidity + cdrdao cdparanoia genisoimage sox mp3blaster + @!squeeze @!wheezy x264 mkvtoolnix vorbis-tools @X cheese @!alpha mencoder; @@ -362,17 +388,17 @@ if @general-use { @X amarok; # communication - install mutt alpine tin irssi efax @!lucid @!maverick @!squeeze mailx + install mutt alpine tin irssi efax @!lucid @!maverick @!squeeze @!wheezy mailx @squeeze/lucid/maverick bsd-mailx procmail centerim fetchmail nn slrn spamassassin trn4 @lenny @!squeeze @!alpha pine; # utilities install rdiff dosfstools tofrodos mc wodim socat snmp @!lucid @!maverick busybox - @lucid/maverick busybox-static uboot-mkimage + @lucid/maverick busybox-static uboot-mkimage most bonnie++ latencytop time bsdmainutils dctrl-tools ddrescue gddrescue file parchive par2 realpath reportbug rpm shtool smbclient stow xstow - sysstat unison john iotop sg3-utils attr dstat i2c-tools + sysstat unison john iotop sg3-utils attr dstat @!container i2c-tools rstat-client dnstracer parted tree apt-file makepasswd @x86 syslinux finger fdupes bchunk cowsay 9base; @@ -402,6 +428,9 @@ if @X { # window managers install xmonad stumpwm wmii @!maverick ion3; + # widgets + install xmobar; + # fonts install console-terminus xfonts-terminus gsfonts gsfonts-x11 ttf-dejavu ttf-opensymbol ttf-freefont; @@ -446,14 +475,14 @@ if @X { # electronics install geda ktechlab arduino ngspice bristol cl-rlc electric gerbv gnucap gpsim gsmc gspiceui gtkwave klogic linsmith - octave-ocs oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc + oregano pcb pcb-gtk qucs tkgate xcircuit xsmc-calc eagle kic kicad; # virtualization install virtualbox-ose; # miscellaneous - install gucharmap gmrun dzen2 xserver-xephyr + install gucharmap gmrun dzen2 xserver-xephyr xtightvncviewer @lenny/squeeze wine; }; @@ -465,17 +494,18 @@ if @core { # evil packages remove pulseaudio avahi-daemon evolution-data-server @!lenny docky - @!lenny @!squeeze ureadahead lirc joe + @!lenny @!squeeze @!wheezy ureadahead lirc joe mlocate locate; # useless packages remove winbind gpm @!audio timidity @!lenny modemmanager - libpam-ldap @!lenny libpam-ldapd + libpam-ldap @!lenny libpam-ldapd auditd + isc-dhcp-client/dhcp3-client @!squeeze @!wheezy dhcp-client @!lenny blcr-dkms - @!squeeze @!lenny apparmor @!squeeze @!lenny packagekit; + @!squeeze @!lenny @!wheezy apparmor @!squeeze @!lenny packagekit; # X-only packages - @!X remove fam gamin hal pidgin dbus dbus-x11; + @!X remove fam gamin hal pidgin dbus dbus-x11 xfonts-100dpi; # static network only remove network-manager-kde network-manager-pptp @@ -483,6 +513,6 @@ if @core { wpasupplicant; # obsolete daemons - remove nagios-nrpe-server watchdog @!squeeze autofs autofs5 cups - @!sodium-benzoate snmpd; + remove nagios-nrpe-server watchdog @!squeeze @!wheezy autofs autofs5 cups + @!sodium-benzoate @!corn-syrup snmpd; };