# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-2
-madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4099-0
+linux-2.6-BRANCH := rhel6
+linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-5
+madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@master
iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
iptables-BUILD-FROM-SRPM := yes # tmp
iproute-BUILD-FROM-SRPM := yes
util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
+nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-25
# Trellis-specific NodeManager plugins
NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH := 0.9
-vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.9-5
+vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-0
vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-25
plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-24
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
-ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
+ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8
###
-sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-10
+sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-11
nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-3
bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15
pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-9
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14
bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-4
bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6