Index: head/sysutils/Makefile =================================================================== --- head/sysutils/Makefile (revision 448348) +++ head/sysutils/Makefile (revision 448349) @@ -1,1347 +1,1348 @@ # $FreeBSD$ # COMMENT = System utilities SUBDIR += 3dm SUBDIR += 44bsd-more SUBDIR += 915resolution SUBDIR += DTraceToolkit SUBDIR += LPRng SUBDIR += LPRngTool SUBDIR += UEFITool SUBDIR += abck SUBDIR += abduco SUBDIR += abgx360 SUBDIR += abgx360gui SUBDIR += accountsservice SUBDIR += acerhdf-kmod SUBDIR += acpi_call SUBDIR += acpica-tools SUBDIR += acts SUBDIR += adtool SUBDIR += afbinit SUBDIR += afflib SUBDIR += afio SUBDIR += agedu SUBDIR += ah-tty SUBDIR += aimage SUBDIR += aird SUBDIR += am-utils SUBDIR += amazon-ssm-agent SUBDIR += amdmsrtweaker SUBDIR += amrstat SUBDIR += amtc SUBDIR += anacron SUBDIR += and SUBDIR += android-file-transfer SUBDIR += android-file-transfer-qt4 SUBDIR += android-file-transfer-qt5 SUBDIR += ansible SUBDIR += ansible1 SUBDIR += anvil SUBDIR += apachetop SUBDIR += apcpwr SUBDIR += apcupsd SUBDIR += arcconf SUBDIR += archivemount SUBDIR += areca-cli SUBDIR += ascpu SUBDIR += asfsm SUBDIR += asmem SUBDIR += asmon SUBDIR += asusoled SUBDIR += ataidle SUBDIR += atf-allwinner SUBDIR += atitvout SUBDIR += atop SUBDIR += auto-admin SUBDIR += autojump SUBDIR += automount SUBDIR += automounter SUBDIR += autopsy SUBDIR += avfs SUBDIR += azure-agent SUBDIR += b2sum SUBDIR += b43-fwcutter SUBDIR += backupchecker SUBDIR += backuppc SUBDIR += backuppc-devel SUBDIR += backuppc4 SUBDIR += bacula-bat SUBDIR += bacula-client SUBDIR += bacula-client-static SUBDIR += bacula-docs SUBDIR += bacula-server SUBDIR += bacula5-bat SUBDIR += bacula5-client SUBDIR += bacula5-client-static SUBDIR += bacula5-docs SUBDIR += bacula5-server SUBDIR += baloo SUBDIR += baloo-widgets SUBDIR += bamf SUBDIR += bareos-bat SUBDIR += bareos-client SUBDIR += bareos-client-static SUBDIR += bareos-docs SUBDIR += bareos-server SUBDIR += bareos-traymonitor SUBDIR += batmon SUBDIR += battfink SUBDIR += battmond SUBDIR += battray SUBDIR += bbapm SUBDIR += bbcp SUBDIR += bchunk SUBDIR += beadm SUBDIR += beadm-devel SUBDIR += beats SUBDIR += bhyve-firmware SUBDIR += bhyve-rc SUBDIR += biosfont SUBDIR += bkpupsd SUBDIR += bksh SUBDIR += boxbackup SUBDIR += boxbackup-devel SUBDIR += brasero SUBDIR += bsd-splash-changer SUBDIR += bsdconfig SUBDIR += bsdcrashtar SUBDIR += bsdhwmon SUBDIR += bsdinfo SUBDIR += bsdisks SUBDIR += bsdmoted SUBDIR += bsdploy SUBDIR += bsdstats SUBDIR += bstack SUBDIR += btsixad SUBDIR += bulk_extractor SUBDIR += burp SUBDIR += busybox SUBDIR += byobu SUBDIR += catfish SUBDIR += cbsd SUBDIR += ccd2iso SUBDIR += cciss_vol_status SUBDIR += ccze SUBDIR += cdargs SUBDIR += cdbkup SUBDIR += cdeploy SUBDIR += cdf SUBDIR += cdircmp SUBDIR += cdls SUBDIR += cdrdao SUBDIR += cdrkit SUBDIR += cdroot SUBDIR += cdrtools SUBDIR += cdrtools-devel SUBDIR += cfengine SUBDIR += cfengine-masterfiles SUBDIR += cfengine-masterfiles310 SUBDIR += cfengine-masterfiles311 SUBDIR += cfengine-masterfiles36 SUBDIR += cfengine-masterfiles37 SUBDIR += cfengine-masterfiles38 SUBDIR += cfengine-masterfiles39 SUBDIR += cfengine22 SUBDIR += cfengine310 SUBDIR += cfengine311 SUBDIR += cfengine32 SUBDIR += cfengine33 SUBDIR += cfengine34 SUBDIR += cfengine35 SUBDIR += cfengine36 SUBDIR += cfengine37 SUBDIR += cfengine38 SUBDIR += cfengine39 SUBDIR += chgrep SUBDIR += chyves SUBDIR += cinnamon-control-center SUBDIR += cinnamon-settings-daemon SUBDIR += ciso SUBDIR += ciso-maker SUBDIR += ck4up SUBDIR += clean SUBDIR += clockspeed SUBDIR += clone SUBDIR += clonehdd SUBDIR += cloop-utils SUBDIR += cloudabi-utils SUBDIR += clsync SUBDIR += cluster-glue SUBDIR += cmdwatch SUBDIR += cmocka SUBDIR += cmockery2 SUBDIR += cmogstored SUBDIR += cmospwd SUBDIR += cog SUBDIR += colorize SUBDIR += condor SUBDIR += confctl SUBDIR += confman SUBDIR += conky SUBDIR += conky-awesome SUBDIR += consolehm SUBDIR += consolekit2 SUBDIR += consul SUBDIR += consul-alerts SUBDIR += contractor SUBDIR += copytape SUBDIR += coreutils SUBDIR += cotty SUBDIR += cpdup SUBDIR += cpu SUBDIR += cpu-x SUBDIR += cpuburn SUBDIR += cpuid SUBDIR += cpulimit SUBDIR += cramfs SUBDIR += crashme SUBDIR += createrepo SUBDIR += cronic SUBDIR += cronolog SUBDIR += cronolog-devel SUBDIR += curly SUBDIR += currtime SUBDIR += cw SUBDIR += daa2iso SUBDIR += dae SUBDIR += daemonize SUBDIR += daemontools SUBDIR += daemontools-encore SUBDIR += dar SUBDIR += dateutils SUBDIR += dc3dd SUBDIR += dcfldd SUBDIR += dd_rescue SUBDIR += ddpt SUBDIR += ddrescue SUBDIR += debhelper SUBDIR += debootstrap SUBDIR += deltarpm SUBDIR += deltup SUBDIR += desktop-installer SUBDIR += detach SUBDIR += detox SUBDIR += devcpu-data SUBDIR += devstat SUBDIR += dfc SUBDIR += di SUBDIR += dim SUBDIR += dirdiff SUBDIR += direnv SUBDIR += dirvish SUBDIR += diskcheckd SUBDIR += diskimage-tools SUBDIR += diskscrub SUBDIR += disktool SUBDIR += disktype SUBDIR += djmount SUBDIR += dmg2img SUBDIR += dmidecode SUBDIR += docker SUBDIR += docker-compose SUBDIR += docker-freebsd SUBDIR += docker-machine SUBDIR += doctl SUBDIR += doinkd SUBDIR += dolly SUBDIR += downtime SUBDIR += downtimed SUBDIR += dsbbatmon SUBDIR += dsbdriverd SUBDIR += dsblogoutmgr SUBDIR += dsbmc SUBDIR += dsbmc-cli SUBDIR += dsbmd SUBDIR += dsbwrtsysctl SUBDIR += dt SUBDIR += dtc SUBDIR += dtpstree SUBDIR += du2ps SUBDIR += duff SUBDIR += dunst SUBDIR += dupd SUBDIR += duplicity SUBDIR += duply SUBDIR += dupmerge SUBDIR += dvd+rw-tools SUBDIR += dvdbackup SUBDIR += dvdimagecmp SUBDIR += dvdisaster SUBDIR += dvdvideo SUBDIR += dvtm SUBDIR += dwatch SUBDIR += e2fsprogs SUBDIR += ec2-scripts SUBDIR += edid-decode SUBDIR += eject SUBDIR += endian SUBDIR += enteruser SUBDIR += entr SUBDIR += env4801 SUBDIR += envconsul SUBDIR += epazote SUBDIR += etcmerge SUBDIR += etcupdate SUBDIR += eventlog SUBDIR += evtviewer SUBDIR += exa SUBDIR += exfat-utils SUBDIR += extipl SUBDIR += ezjail SUBDIR += f3 SUBDIR += facter SUBDIR += fanout SUBDIR += farbot SUBDIR += fastest_cvsup SUBDIR += fatback SUBDIR += fconfig SUBDIR += fcron SUBDIR += fdupes SUBDIR += feather SUBDIR += fetchlog SUBDIR += ffs2recov SUBDIR += file SUBDIR += filedupe SUBDIR += filelight-kde4 SUBDIR += fileprune SUBDIR += fileschanged SUBDIR += filetype SUBDIR += filewatcherd SUBDIR += finfo SUBDIR += firstboot-freebsd-update SUBDIR += firstboot-growfs SUBDIR += firstboot-pkgs SUBDIR += flasher SUBDIR += flashrom SUBDIR += flexbackup SUBDIR += flock SUBDIR += flog SUBDIR += flowgger SUBDIR += fluent-bit SUBDIR += fonteditfs SUBDIR += foremost SUBDIR += fortunelock SUBDIR += fpart SUBDIR += fpc-syslog SUBDIR += fpc-users SUBDIR += fpc-utmp SUBDIR += fpc-uuid SUBDIR += freebsd-snapshot SUBDIR += freecolor SUBDIR += freedt SUBDIR += freefilesync SUBDIR += freeipmi SUBDIR += freesbie SUBDIR += froxlor SUBDIR += fsbackup SUBDIR += fsc SUBDIR += fsearch SUBDIR += fstyp SUBDIR += fswatch-mon SUBDIR += ftwin SUBDIR += fusefs-afuse SUBDIR += fusefs-chironfs SUBDIR += fusefs-cryptofs SUBDIR += fusefs-curlftpfs SUBDIR += fusefs-encfs SUBDIR += fusefs-exfat SUBDIR += fusefs-ext4fuse SUBDIR += fusefs-funionfs SUBDIR += fusefs-fusepak SUBDIR += fusefs-fusexmp_fh SUBDIR += fusefs-gitfs SUBDIR += fusefs-gnome-vfs SUBDIR += fusefs-gstfs SUBDIR += fusefs-gunzip SUBDIR += fusefs-httpfs SUBDIR += fusefs-ifuse SUBDIR += fusefs-libs SUBDIR += fusefs-lkl SUBDIR += fusefs-mhddfs SUBDIR += fusefs-mp3fs SUBDIR += fusefs-ntfs SUBDIR += fusefs-pod SUBDIR += fusefs-rar2fs SUBDIR += fusefs-s3fs SUBDIR += fusefs-simple-mtpfs SUBDIR += fusefs-smbnetfs SUBDIR += fusefs-sqlfs SUBDIR += fusefs-squashfuse SUBDIR += fusefs-sshfs SUBDIR += fusefs-unionfs SUBDIR += fusefs-wdfs SUBDIR += fusefs-wikipediafs SUBDIR += fusefs-zip SUBDIR += fvcool SUBDIR += gaffitter SUBDIR += gai-leds SUBDIR += ganglia-monitor-core SUBDIR += ganglia-webfrontend SUBDIR += gapcmon SUBDIR += garcon SUBDIR += gather SUBDIR += gcdmaster SUBDIR += gcombust SUBDIR += gconf-editor SUBDIR += gdisk SUBDIR += gdmap SUBDIR += genisoimage SUBDIR += geomWatch SUBDIR += getdelta SUBDIR += geteltorito SUBDIR += gigolo SUBDIR += gkfreq SUBDIR += gkleds2 SUBDIR += gkrellfire SUBDIR += gkrellflynn SUBDIR += gkrellm-trayicons SUBDIR += gkrellm2 SUBDIR += gkrelltop SUBDIR += gksu SUBDIR += gnome-control-center SUBDIR += gnome-device-manager SUBDIR += gnome-mount SUBDIR += gnome-pkgview SUBDIR += gnome-power-manager SUBDIR += gnome-schedule SUBDIR += gnome-settings-daemon SUBDIR += gnome-system-monitor SUBDIR += gnome_subr SUBDIR += goaccess SUBDIR += goss SUBDIR += gpart SUBDIR += gpte SUBDIR += graffer SUBDIR += graid5 SUBDIR += graveman SUBDIR += graylog SUBDIR += grub2 SUBDIR += grub2-bhyve SUBDIR += grub2-efi SUBDIR += grub2-pcbsd SUBDIR += gsh SUBDIR += gsmartcontrol SUBDIR += gstopd SUBDIR += gstreamer-plugins-cdio SUBDIR += gstreamer-plugins-hal SUBDIR += gstreamer1-plugins-cdio SUBDIR += gtk-imonc SUBDIR += hachoir-metadata SUBDIR += hachoir-subfile SUBDIR += hachoir-urwid SUBDIR += hachoir-wx SUBDIR += hal SUBDIR += hal-info SUBDIR += hardlink SUBDIR += hatop SUBDIR += hdrecover SUBDIR += healthd SUBDIR += heartbeat SUBDIR += heirloom SUBDIR += hextools SUBDIR += hfm SUBDIR += hfsexplorer SUBDIR += hfsutils SUBDIR += hidesvn SUBDIR += highlnk SUBDIR += hilite SUBDIR += host-setup SUBDIR += hourglass SUBDIR += hoz SUBDIR += hpacucli SUBDIR += hploscripts SUBDIR += hptcli SUBDIR += hs-angel SUBDIR += hs-cpu SUBDIR += hs-disk-free-space SUBDIR += hs-ekg SUBDIR += hs-ekg-core SUBDIR += hs-ekg-json SUBDIR += hs-mountpoints SUBDIR += htop SUBDIR += httplog SUBDIR += hwstat SUBDIR += i2c-tools SUBDIR += i7z SUBDIR += iat SUBDIR += immortal SUBDIR += inotify-tools SUBDIR += installwatch SUBDIR += intel-nvmupdate SUBDIR += intel-pcm SUBDIR += intel-qcu SUBDIR += iocell SUBDIR += iogen SUBDIR += iograph SUBDIR += iohyve SUBDIR += ioping SUBDIR += ipa SUBDIR += ipad_charge SUBDIR += ipdbtools SUBDIR += ipfs-go SUBDIR += ipmitool SUBDIR += ipsc SUBDIR += isc-cron SUBDIR += isomaster SUBDIR += isomd5sum SUBDIR += istatserver SUBDIR += jadm SUBDIR += jail-primer SUBDIR += jailadmin SUBDIR += jailctl SUBDIR += jaildaemon SUBDIR += jailme SUBDIR += jailrc SUBDIR += jailutils SUBDIR += javaservicewrapper SUBDIR += jdiskreport SUBDIR += jdupes SUBDIR += jkill SUBDIR += jobd SUBDIR += jps SUBDIR += jtop SUBDIR += jtopen SUBDIR += jvmtop SUBDIR += jx SUBDIR += k3b-kde4 SUBDIR += k8temp SUBDIR += kcm-polkit-kde SUBDIR += kcron SUBDIR += kdeadmin4 SUBDIR += kdf SUBDIR += kdirstat SUBDIR += keyboard-daemon SUBDIR += kf5-baloo SUBDIR += kf5-kwallet SUBDIR += kfilemetadata SUBDIR += kfloppy SUBDIR += kiconvtool SUBDIR += kldfind SUBDIR += kldpatch SUBDIR += knutclient-kde4 SUBDIR += krename-kde4 SUBDIR += kshutdown-kde4 SUBDIR += ksysguardd SUBDIR += ksystemlog SUBDIR += kuser SUBDIR += lava SUBDIR += lbl-cf SUBDIR += lbl-hf SUBDIR += lcdproc SUBDIR += ldap-account-manager SUBDIR += ldapvi SUBDIR += ledit SUBDIR += less SUBDIR += lfm SUBDIR += libcdio SUBDIR += libcdio-paranoia SUBDIR += libchk SUBDIR += libcpuid SUBDIR += libfvde SUBDIR += libgksu SUBDIR += libieee1284 SUBDIR += libretto-config SUBDIR += libsunacl SUBDIR += liburcu SUBDIR += libutempter SUBDIR += life-preserver SUBDIR += lineak-defaultplugin SUBDIR += lineak-xosdplugin SUBDIR += lineakd SUBDIR += linrename SUBDIR += linux-crashplan SUBDIR += linuxfdisk SUBDIR += livecd SUBDIR += lmmon SUBDIR += lmon SUBDIR += lnav SUBDIR += log_analysis SUBDIR += logrotate SUBDIR += logstalgia SUBDIR += logstash SUBDIR += logstash-forwarder SUBDIR += logstash5 SUBDIR += logtool SUBDIR += logwatch SUBDIR += lookat SUBDIR += lr SUBDIR += lsof SUBDIR += lsop SUBDIR += ltrace SUBDIR += lttng-tools SUBDIR += lttng-ust SUBDIR += luckybackup SUBDIR += lxinput SUBDIR += lxsplit SUBDIR += lxtask SUBDIR += lxterminal SUBDIR += magicrescue SUBDIR += manck SUBDIR += mapchan SUBDIR += massadmin SUBDIR += mate-control-center SUBDIR += mate-polkit SUBDIR += mate-power-manager SUBDIR += mate-settings-daemon SUBDIR += mate-system-monitor SUBDIR += mbgtools SUBDIR += mcelog SUBDIR += mcollective SUBDIR += mcollective-actionpolicy-auth SUBDIR += mcollective-nettest-agent SUBDIR += mcollective-nettest-client SUBDIR += mcollective-nettest-common SUBDIR += mcollective-nrpe-agent SUBDIR += mcollective-nrpe-client SUBDIR += mcollective-nrpe-common SUBDIR += mcollective-puppet-agent SUBDIR += mcollective-puppet-client SUBDIR += mcollective-puppet-common SUBDIR += mcollective-service-agent SUBDIR += mcollective-service-client SUBDIR += mcollective-service-common SUBDIR += mcollective-shell-agent SUBDIR += mcollective-shell-client SUBDIR += mcron SUBDIR += mcweject SUBDIR += mdcp SUBDIR += mdf2iso SUBDIR += megacli SUBDIR += megarc SUBDIR += memdump SUBDIR += memfetch SUBDIR += memtest SUBDIR += memtest86 SUBDIR += memtest86+ SUBDIR += metalog SUBDIR += mfid SUBDIR += mgeupsd SUBDIR += minimunin SUBDIR += minirsyslogd SUBDIR += mixer SUBDIR += mkfile SUBDIR += mkfwimage SUBDIR += mkntpwd SUBDIR += mksunbootcd SUBDIR += mmc-utils SUBDIR += mnrpes SUBDIR += modman SUBDIR += modules SUBDIR += mog SUBDIR += monit SUBDIR += monitord SUBDIR += monitorix SUBDIR += mono-kmod SUBDIR += moosefs2-cgi SUBDIR += moosefs2-cgiserv SUBDIR += moosefs2-chunkserver SUBDIR += moosefs2-cli SUBDIR += moosefs2-client SUBDIR += moosefs2-master SUBDIR += moosefs2-metalogger SUBDIR += moosefs2-netdump SUBDIR += moosefs3-cgi SUBDIR += moosefs3-cgiserv SUBDIR += moosefs3-chunkserver SUBDIR += moosefs3-cli SUBDIR += moosefs3-client SUBDIR += moosefs3-master SUBDIR += moosefs3-metalogger SUBDIR += moosefs3-netdump SUBDIR += moreutils SUBDIR += most SUBDIR += mount.app SUBDIR += mountsmb2 SUBDIR += mpiexec SUBDIR += mptd SUBDIR += msktutil SUBDIR += msyslog SUBDIR += mtpfs SUBDIR += mtxorbd SUBDIR += multitail SUBDIR += munin-common SUBDIR += munin-contrib SUBDIR += munin-master SUBDIR += munin-node SUBDIR += muse SUBDIR += mybashburn SUBDIR += myrescue SUBDIR += n98-magerun SUBDIR += nagios-statd SUBDIR += namefix SUBDIR += nbosd SUBDIR += ncdu SUBDIR += ndmpd SUBDIR += nepomuk-core SUBDIR += nepomuk-widgets SUBDIR += nfcutils SUBDIR += nfsping SUBDIR += nitrogen SUBDIR += no-login SUBDIR += node_exporter SUBDIR += nomad SUBDIR += npadmin SUBDIR += nrg2iso SUBDIR += nut SUBDIR += nvclock SUBDIR += nvramtool SUBDIR += oak SUBDIR += obliterate SUBDIR += odo SUBDIR += ods2 SUBDIR += ohmu SUBDIR += open SUBDIR += openhpi SUBDIR += openipmi SUBDIR += openupsd SUBDIR += ori SUBDIR += osinfo-db-tools SUBDIR += osquery SUBDIR += p5-BSD-Jail-Object SUBDIR += p5-BSD-Process SUBDIR += p5-BSD-Sysctl SUBDIR += p5-BackupPC-XS SUBDIR += p5-Brackup SUBDIR += p5-Dir-Purge SUBDIR += p5-File-DirCompare SUBDIR += p5-File-Listing SUBDIR += p5-File-Log SUBDIR += p5-File-Next SUBDIR += p5-File-Signature SUBDIR += p5-File-Stat-Bits SUBDIR += p5-File-Stat-ModeString SUBDIR += p5-File-Tee SUBDIR += p5-File-Which SUBDIR += p5-Filesys-Df SUBDIR += p5-Filesys-DfPortable SUBDIR += p5-Filesys-DiskFree SUBDIR += p5-Filesys-DiskSpace SUBDIR += p5-Filesys-DiskUsage SUBDIR += p5-Filesys-Statvfs SUBDIR += p5-Fuse SUBDIR += p5-Fuse-Simple SUBDIR += p5-Giovanni SUBDIR += p5-Iterator-File SUBDIR += p5-Lchown SUBDIR += p5-Linux-Cpuinfo SUBDIR += p5-Log-Syslog-Constants SUBDIR += p5-Log-Syslog-Fast SUBDIR += p5-MogileFS-Client SUBDIR += p5-MogileFS-Network SUBDIR += p5-MogileFS-Server SUBDIR += p5-MogileFS-Utils SUBDIR += p5-Monitor-Simple SUBDIR += p5-Plugtools SUBDIR += p5-Plugtools-Plugins-HomeOU SUBDIR += p5-Probe-Perl SUBDIR += p5-Proc-PidUtil SUBDIR += p5-Proclet SUBDIR += p5-Quota SUBDIR += p5-Rex SUBDIR += p5-Samba-SIDhelper SUBDIR += p5-Schedule-At SUBDIR += p5-Schedule-Cron SUBDIR += p5-Schedule-Cron-Events SUBDIR += p5-Schedule-Load SUBDIR += p5-Schedule-Match SUBDIR += p5-Shell-Command SUBDIR += p5-Stat-lsMode SUBDIR += p5-Sys-CpuLoad SUBDIR += p5-Sys-Filesystem SUBDIR += p5-Sys-Gamin SUBDIR += p5-Sys-Group-GIDhelper SUBDIR += p5-Sys-HostIP SUBDIR += p5-Sys-Hostname-FQDN SUBDIR += p5-Sys-Hostname-Long SUBDIR += p5-Sys-Load SUBDIR += p5-Sys-Syslog SUBDIR += p5-Sys-User-UIDhelper SUBDIR += p5-Sysadm-Install SUBDIR += p5-SyslogScan SUBDIR += p5-Tail-Stat SUBDIR += p5-Tie-Syslog SUBDIR += p5-Ubic SUBDIR += p5-Unix-ConfigFile SUBDIR += p5-Unix-Lsof SUBDIR += p5-Unix-Mknod SUBDIR += p5-Unix-Processors SUBDIR += p5-Unix-Syslog SUBDIR += p5-User SUBDIR += p5-ZConf-Cron SUBDIR += p5-arclog SUBDIR += p5-reslog SUBDIR += packer SUBDIR += pacman SUBDIR += paicc SUBDIR += paladin SUBDIR += pam_mount SUBDIR += panicmail SUBDIR += parafly SUBDIR += parallel SUBDIR += password-store SUBDIR += passwordsafe SUBDIR += patchelf SUBDIR += pax-utils SUBDIR += pbi-manager SUBDIR += pbimaker SUBDIR += pcapfix SUBDIR += pcbsd-appweb SUBDIR += pcbsd-libsh SUBDIR += pcbsd-syscache SUBDIR += pcbsd-utils SUBDIR += pcbsd-utils-qt5 SUBDIR += pciutils SUBDIR += pcpustat SUBDIR += pdixtract SUBDIR += pdumpfs SUBDIR += pear-Cache SUBDIR += pear-Cache_Lite SUBDIR += pear-File SUBDIR += pear-File_Find SUBDIR += pear-File_Fstab SUBDIR += pear-File_Gettext SUBDIR += pear-Horde_Log SUBDIR += pear-Horde_Vfs SUBDIR += pear-I18Nv2 SUBDIR += pear-Log SUBDIR += pear-Translation2 SUBDIR += pecl-mogilefs SUBDIR += pecl-proctitle SUBDIR += pefs-kmod SUBDIR += personality SUBDIR += pesign SUBDIR += pflogx SUBDIR += pfstat SUBDIR += pftables SUBDIR += pftop SUBDIR += phantom SUBDIR += php56-fileinfo SUBDIR += php56-posix SUBDIR += php70-fileinfo SUBDIR += php70-posix SUBDIR += php71-fileinfo SUBDIR += php71-posix SUBDIR += phybs SUBDIR += pick SUBDIR += pidof SUBDIR += pipemeter SUBDIR += plconfig SUBDIR += pmt SUBDIR += policykit SUBDIR += policykit-gnome SUBDIR += policykit-qt SUBDIR += polkit SUBDIR += polkit-gnome SUBDIR += polkit-kde SUBDIR += polkit-qt SUBDIR += polkit-qt5 SUBDIR += powerdxx SUBDIR += powerman SUBDIR += powermon SUBDIR += pp SUBDIR += pprotectd SUBDIR += prelink SUBDIR += prips SUBDIR += procenv SUBDIR += procmap SUBDIR += progsreiserfs SUBDIR += pslist SUBDIR += psmisc SUBDIR += pstack SUBDIR += pstacku SUBDIR += pstree SUBDIR += ptools SUBDIR += puppet-lint SUBDIR += puppet-mode.el SUBDIR += puppet4 SUBDIR += puppet5 SUBDIR += puppetserver SUBDIR += pv SUBDIR += pwd_unmkdb SUBDIR += pwgen SUBDIR += pwsafe SUBDIR += pxattr SUBDIR += py-XenAPI SUBDIR += py-analyzemft SUBDIR += py-bcfg2 SUBDIR += py-cdmi SUBDIR += py-consul SUBDIR += py-croniter SUBDIR += py-crontab SUBDIR += py-diffoscope SUBDIR += py-dirsync SUBDIR += py-dlipower SUBDIR += py-docker SUBDIR += py-drmaa SUBDIR += py-execnet SUBDIR += py-ezjailremote SUBDIR += py-filelike SUBDIR += py-freenas.cli SUBDIR += py-glances SUBDIR += py-gmailfs-fuse + SUBDIR += py-google-compute-engine SUBDIR += py-halite SUBDIR += py-honcho SUBDIR += py-iowait SUBDIR += py-nagiosplugin SUBDIR += py-nomad SUBDIR += py-pkginfo SUBDIR += py-ploy SUBDIR += py-ploy_ansible SUBDIR += py-ploy_ec2 SUBDIR += py-ploy_ezjail SUBDIR += py-ploy_fabric SUBDIR += py-plumbum SUBDIR += py-power SUBDIR += py-psutil SUBDIR += py-psutil121 SUBDIR += py-ptyprocess SUBDIR += py-pytsk SUBDIR += py-pywatchman SUBDIR += py-queuelib SUBDIR += py-ranger SUBDIR += py-salt SUBDIR += py-scandir SUBDIR += py-scriptine SUBDIR += py-shutilwhich SUBDIR += py-stdiff SUBDIR += py-supervisor SUBDIR += py-tmuxp SUBDIR += py-uptime SUBDIR += py-zdaemon SUBDIR += py-zfs SUBDIR += py3-execnet SUBDIR += py3-iocage SUBDIR += py3-pkginfo SUBDIR += py3-ptyprocess SUBDIR += pydf SUBDIR += qchroot SUBDIR += qjail SUBDIR += qjail2 SUBDIR += qjail4 SUBDIR += qlogtools SUBDIR += qpxtool SUBDIR += qsynergy SUBDIR += qt5-qtdiag SUBDIR += qt5-qtpaths SUBDIR += qt5-qtplugininfo SUBDIR += qtpass SUBDIR += quicksynergy SUBDIR += qzeitgeist SUBDIR += racktables SUBDIR += radeontool SUBDIR += radeontop SUBDIR += radmind SUBDIR += rainbarf SUBDIR += raincoat SUBDIR += rcadm SUBDIR += rclean SUBDIR += rcm SUBDIR += rdate SUBDIR += rdiff-backup SUBDIR += rdiff-backup-devel SUBDIR += rdup SUBDIR += read-edid SUBDIR += realsync SUBDIR += recoverdm SUBDIR += reed SUBDIR += rej SUBDIR += relaxconf SUBDIR += rename SUBDIR += renameutils SUBDIR += reoback SUBDIR += reptyr SUBDIR += respond SUBDIR += restic SUBDIR += retail SUBDIR += rex SUBDIR += rfstool SUBDIR += rhc SUBDIR += riak-cs SUBDIR += rinse SUBDIR += rmonitor SUBDIR += roottail SUBDIR += rovclock SUBDIR += rsnapshot SUBDIR += rsyncbackup SUBDIR += rsyncrypto SUBDIR += rsyslog8 SUBDIR += rtty SUBDIR += rubygem-backup SUBDIR += rubygem-bosh-gen SUBDIR += rubygem-bosh_cli SUBDIR += rubygem-bundler SUBDIR += rubygem-bundler_ext SUBDIR += rubygem-capistrano SUBDIR += rubygem-capistrano-ext SUBDIR += rubygem-capistrano-harrow SUBDIR += rubygem-chef SUBDIR += rubygem-chef-api SUBDIR += rubygem-chef-config SUBDIR += rubygem-chef-zero SUBDIR += rubygem-facter SUBDIR += rubygem-fluent-mixin-plaintextformatter SUBDIR += rubygem-fluent-plugin-config-expander SUBDIR += rubygem-fluent-plugin-file-alternative SUBDIR += rubygem-fluent-plugin-graylog SUBDIR += rubygem-fluent-plugin-tail-asis SUBDIR += rubygem-fluentd SUBDIR += rubygem-fluentd010 SUBDIR += rubygem-fssm SUBDIR += rubygem-god SUBDIR += rubygem-guard SUBDIR += rubygem-guard-compat SUBDIR += rubygem-guard-livereload SUBDIR += rubygem-guard-minitest SUBDIR += rubygem-guard-rspec SUBDIR += rubygem-hammer_cli SUBDIR += rubygem-hammer_cli_foreman SUBDIR += rubygem-hammer_cli_foreman_bootdisk SUBDIR += rubygem-hammer_cli_foreman_salt SUBDIR += rubygem-hammer_cli_foreman_ssh SUBDIR += rubygem-hiera SUBDIR += rubygem-hiera-eyaml SUBDIR += rubygem-hiera-file SUBDIR += rubygem-hiera1 SUBDIR += rubygem-hieracles SUBDIR += rubygem-httplog SUBDIR += rubygem-itamae SUBDIR += rubygem-librarian-puppet SUBDIR += rubygem-log4r SUBDIR += rubygem-logify SUBDIR += rubygem-mogilefs-client SUBDIR += rubygem-mothra SUBDIR += rubygem-murder SUBDIR += rubygem-ohai SUBDIR += rubygem-parallel SUBDIR += rubygem-puppet_forge SUBDIR += rubygem-r10k SUBDIR += rubygem-rubyipmi SUBDIR += rubygem-serverspec SUBDIR += rubygem-shellany SUBDIR += rubygem-smart_proxy_chef SUBDIR += rubygem-smart_proxy_dynflow SUBDIR += rubygem-smart_proxy_remote_execution_ssh SUBDIR += rubygem-smart_proxy_salt SUBDIR += rubygem-specinfra SUBDIR += rubygem-sys-admin SUBDIR += rubygem-sys-cpu SUBDIR += rubygem-sys-filesystem SUBDIR += rubygem-sys-host SUBDIR += rubygem-sys-proctable SUBDIR += rubygem-sys-uname SUBDIR += rubygem-sys-uptime SUBDIR += rubygem-syslog-logger SUBDIR += rubygem-teamocil SUBDIR += rubygem-tmuxinator SUBDIR += rubygem-vagrant-bhyve SUBDIR += rubygem-vagrant-mutate SUBDIR += rubygem-vagrant-vbguest SUBDIR += rubygem-vmstat SUBDIR += rubygem-winrm SUBDIR += rubygem-winrm-elevated SUBDIR += rubygem-winrm-fs SUBDIR += rubygem-yell SUBDIR += rundeck SUBDIR += runit SUBDIR += runwhen SUBDIR += s6 SUBDIR += s6-rc SUBDIR += safe-rm SUBDIR += safecat SUBDIR += safecopy SUBDIR += samefile SUBDIR += samesame SUBDIR += sample SUBDIR += sas2ircu SUBDIR += sas3ircu SUBDIR += savelogs SUBDIR += sb16config SUBDIR += sbsigntool SUBDIR += scalpel SUBDIR += scan_ffs SUBDIR += scanbuttond SUBDIR += scct SUBDIR += schedutils SUBDIR += scprotect SUBDIR += screen SUBDIR += screenfetch SUBDIR += screenie SUBDIR += scterc SUBDIR += sd-agent SUBDIR += sdparm SUBDIR += searchmonkey SUBDIR += seatools SUBDIR += sec SUBDIR += serf SUBDIR += setcdboot SUBDIR += setquota SUBDIR += sformat SUBDIR += sg3_utils SUBDIR += shim SUBDIR += shlock SUBDIR += shmcat SUBDIR += showbeastie SUBDIR += siegfried SUBDIR += signon-qt5 SUBDIR += signon-ui SUBDIR += skill SUBDIR += slack SUBDIR += sleuthkit SUBDIR += sloth SUBDIR += slst SUBDIR += slurm-wlm SUBDIR += smartmontools SUBDIR += smenu SUBDIR += smp_utils SUBDIR += snap SUBDIR += snowlog SUBDIR += socket SUBDIR += socklog SUBDIR += solaar SUBDIR += sortu SUBDIR += spindown SUBDIR += spinner SUBDIR += spiped SUBDIR += squashfs-tools SUBDIR += sshsudo SUBDIR += ssid SUBDIR += ssync SUBDIR += stalepid SUBDIR += stanchion SUBDIR += stmpclean SUBDIR += storcli SUBDIR += stow SUBDIR += stowES SUBDIR += stress SUBDIR += superiotool SUBDIR += swapd SUBDIR += swapexd SUBDIR += swapmon SUBDIR += sweeper SUBDIR += symlinks SUBDIR += symon SUBDIR += synergy SUBDIR += sysadm SUBDIR += sysadm-client SUBDIR += sysgather SUBDIR += sysinfo SUBDIR += syslinux SUBDIR += syslog-ng SUBDIR += syslog-ng-incubator SUBDIR += syslog-ng36 SUBDIR += syslog-ng37 SUBDIR += syslog-ng39 SUBDIR += syslog-ng310 SUBDIR += syslogger SUBDIR += sysrc SUBDIR += system-tools-backends SUBDIR += sysvbanner SUBDIR += tai64nfrac SUBDIR += tarsnap SUBDIR += tarsnap-gui SUBDIR += tarsnap-periodic SUBDIR += tartarus SUBDIR += tbku SUBDIR += tclsyslog SUBDIR += tcplist SUBDIR += tdir SUBDIR += tenshi SUBDIR += tentakel SUBDIR += terraform SUBDIR += testdisk SUBDIR += thefish SUBDIR += timelimit SUBDIR += timemon SUBDIR += titlefix SUBDIR += tkdvd SUBDIR += tlsdate SUBDIR += tm SUBDIR += tmate SUBDIR += tmate-slave SUBDIR += tmpreaper SUBDIR += tmpwatch SUBDIR += tmux SUBDIR += tmux-mem-cpu-load SUBDIR += topless SUBDIR += torque SUBDIR += toshctl SUBDIR += tracker SUBDIR += tree SUBDIR += tren SUBDIR += ts SUBDIR += tss SUBDIR += tty-clock SUBDIR += ttyd SUBDIR += ttyload SUBDIR += tuptime SUBDIR += tw_cli SUBDIR += tzdialog SUBDIR += u-boot-a13-olinuxino SUBDIR += u-boot-bananapi SUBDIR += u-boot-bananapim2 SUBDIR += u-boot-beaglebone SUBDIR += u-boot-chip SUBDIR += u-boot-cubieboard SUBDIR += u-boot-cubieboard2 SUBDIR += u-boot-cubox-hummingboard SUBDIR += u-boot-duovero SUBDIR += u-boot-imx-serial-loader SUBDIR += u-boot-master SUBDIR += u-boot-nanopi-m1plus SUBDIR += u-boot-nanopi-neo SUBDIR += u-boot-nanopi-neo-air SUBDIR += u-boot-olimex-a20-som-evb SUBDIR += u-boot-olinuxino-lime SUBDIR += u-boot-orangepi-one SUBDIR += u-boot-orangepi-plus-2e SUBDIR += u-boot-pandaboard SUBDIR += u-boot-pcduino3 SUBDIR += u-boot-pine64 SUBDIR += u-boot-rpi SUBDIR += u-boot-rpi2 SUBDIR += u-boot-rpi3 SUBDIR += u-boot-sinovoip-bpi-m3 SUBDIR += u-boot-utilite SUBDIR += u-boot-wandboard SUBDIR += u-boot-zedboard SUBDIR += u-boot-zybo SUBDIR += ua SUBDIR += ucspi-ipc SUBDIR += ucspi-proxy SUBDIR += ucspi-ssl SUBDIR += ucspi-tcp SUBDIR += ucspi-unix SUBDIR += udfclient SUBDIR += uefi-edk2-bhyve SUBDIR += uefi-edk2-bhyve-csm SUBDIR += ufs_copy SUBDIR += uhidd SUBDIR += uif2iso SUBDIR += unieject SUBDIR += uniutils SUBDIR += unquote SUBDIR += unstow SUBDIR += upower SUBDIR += upsdaemon SUBDIR += uptimed SUBDIR += usb_modeswitch SUBDIR += usbhid-dump SUBDIR += usbhotkey SUBDIR += usbutils SUBDIR += uschedule SUBDIR += userinfo SUBDIR += userlist SUBDIR += usermatic SUBDIR += usermin SUBDIR += userneu SUBDIR += userneu-devel SUBDIR += usrinfo SUBDIR += utcount SUBDIR += vagrant SUBDIR += vbetool SUBDIR += vchanger SUBDIR += vcp SUBDIR += videogen SUBDIR += vii SUBDIR += vils SUBDIR += vimpager SUBDIR += virtualmin SUBDIR += vm-bhyve SUBDIR += vmdktool SUBDIR += vmtouch SUBDIR += vobcopy SUBDIR += volman SUBDIR += vordog SUBDIR += vpnc-scripts SUBDIR += vstrip SUBDIR += vttest SUBDIR += wait_on SUBDIR += warden SUBDIR += watchdog SUBDIR += watchfolder SUBDIR += watchman SUBDIR += watchmen SUBDIR += webjob SUBDIR += webmin SUBDIR += weedit SUBDIR += wemux SUBDIR += whatpix SUBDIR += whowatch SUBDIR += wiimms SUBDIR += wmapmload SUBDIR += wmbluecpu SUBDIR += wmbsdbatt SUBDIR += wmcpuload SUBDIR += wmcube SUBDIR += wmcube-gdk SUBDIR += wmdiskmon SUBDIR += wmfire SUBDIR += wmflame SUBDIR += wmmemfree SUBDIR += wmmemload SUBDIR += wmtop SUBDIR += wmupmon SUBDIR += worldtools SUBDIR += wtail SUBDIR += wuzzah SUBDIR += x86info SUBDIR += xbatt SUBDIR += xbattbar SUBDIR += xcdroast SUBDIR += xcpustate SUBDIR += xdu SUBDIR += xe SUBDIR += xe-guest-utilities SUBDIR += xen-guest-tools SUBDIR += xen-tools SUBDIR += xfburn SUBDIR += xfce4-battery-plugin SUBDIR += xfce4-bsdcpufreq-plugin SUBDIR += xfce4-cpugraph-plugin SUBDIR += xfce4-diskperf-plugin SUBDIR += xfce4-fsguard-plugin SUBDIR += xfce4-genmon-plugin SUBDIR += xfce4-mount-plugin SUBDIR += xfce4-netload-plugin SUBDIR += xfce4-power-manager SUBDIR += xfce4-settings SUBDIR += xfce4-systemload-plugin SUBDIR += xfce4-wavelan-plugin SUBDIR += xfsm SUBDIR += xfsprogs SUBDIR += xin SUBDIR += xjobs SUBDIR += xlogmaster SUBDIR += xmbmon SUBDIR += xorriso SUBDIR += xosview SUBDIR += xstow SUBDIR += xsysstats SUBDIR += xvidcap SUBDIR += yum SUBDIR += zap SUBDIR += zbackup SUBDIR += zeitgeist SUBDIR += zeroer SUBDIR += zetaback SUBDIR += zfs-periodic SUBDIR += zfs-replicate SUBDIR += zfs-snap-diff SUBDIR += zfs-snapshot-clean SUBDIR += zfs-snapshot-mgmt SUBDIR += zfs-stats SUBDIR += zfs-stats-lite SUBDIR += zfsnap SUBDIR += zfsnap2 SUBDIR += zfstools SUBDIR += zidrav SUBDIR += zisofs-tools SUBDIR += zogftw SUBDIR += zrep SUBDIR += zsd SUBDIR += zxfer .include Index: head/sysutils/py-google-compute-engine/Makefile =================================================================== --- head/sysutils/py-google-compute-engine/Makefile (nonexistent) +++ head/sysutils/py-google-compute-engine/Makefile (revision 448349) @@ -0,0 +1,44 @@ +# $FreeBSD$ + +PORTNAME= google-compute-engine +PORTVERSION= 2.4.1 +CATEGORIES= sysutils python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= helen.koike@collabora.com +COMMENT= Guest Environment for Google Compute Engine + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ + sudo:security/sudo + +USES= python +USE_PYTHON= autoplist concurrent distutils + +USE_RC_SUBR= google_instance_setup \ + google_network_setup \ + google_accounts_daemon \ + google_clock_skew_daemon \ + google_startup + +NO_ARCH= yes + +SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" +REINPLACE_ARGS= -i '' + +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/google_compute_engine/accounts/accounts_utils.py \ + ${WRKSRC}/google_compute_engine/boto/boto_config.py \ + ${WRKSRC}/google_compute_engine/boto/compute_auth.py \ + ${WRKSRC}/google_compute_engine/config_manager.py \ + ${WRKSRC}/google_compute_engine/instance_setup/instance_config.py \ + ${WRKSRC}/google_compute_engine/metadata_scripts/script_executor.py \ + ${WRKSRC}/google_compute_engine/network_setup/network_setup.py + +.include Property changes on: head/sysutils/py-google-compute-engine/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/distinfo =================================================================== --- head/sysutils/py-google-compute-engine/distinfo (nonexistent) +++ head/sysutils/py-google-compute-engine/distinfo (revision 448349) @@ -0,0 +1,3 @@ +TIMESTAMP = 1501403910 +SHA256 (google-compute-engine-2.4.1.tar.gz) = d1709420ade5e7b8318b73c8ae245382cfe362e0f9b5236d3a28c0459a6d8d49 +SIZE (google-compute-engine-2.4.1.tar.gz) = 28626 Property changes on: head/sysutils/py-google-compute-engine/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in (revision 448349) @@ -0,0 +1,34 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_accounts_daemon +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd google_instance_setup google_network_setup +# KEYWORD: shutdown +# +# google_accounts_daemon_enable (bool): Set to NO by default. +# Set it to YES to enable google_accounts_daemon. +# + +. /etc/rc.subr + +name="google_accounts_daemon" +rcvar="google_accounts_daemon_enable" + +load_rc_config "${name}" + +: ${google_accounts_daemon_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}.pid +start_cmd="google_accounts_daemon_start" + +google_accounts_daemon_start() +{ + check_startmsgs && echo "Starting ${name}." + daemon -p ${pidfile} -t ${name} ${command} +} + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in (revision 448349) @@ -0,0 +1,34 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_clock_skew_daemon +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd google_instance_setup google_network_setup +# KEYWORD: shutdown +# +# google_clock_skew_daemon_enable (bool): Set to NO by default. +# Set it to YES to enable google_clock_skew_daemon. +# + +. /etc/rc.subr + +name="google_clock_skew_daemon" +rcvar="google_clock_skew_daemon_enable" + +load_rc_config "${name}" + +: ${google_clock_skew_daemon_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}.pid +start_cmd="google_clock_skew_daemon_start" + +google_clock_skew_daemon_start() +{ + check_startmsgs && echo "Starting ${name}." + daemon -p ${pidfile} -t ${name} ${command} +} + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_instance_setup.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_instance_setup.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_instance_setup.in (revision 448349) @@ -0,0 +1,26 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_instance_setup +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd +# +# google_instance_setup_enable (bool): Set to NO by default. +# Set it to YES to enable google_instance_setup. +# + +. /etc/rc.subr + +name="google_instance_setup" +rcvar="google_instance_setup_enable" + +load_rc_config "${name}" + +: ${google_instance_setup_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}.pid + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_instance_setup.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_ip_forwarding_daemon.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_ip_forwarding_daemon.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_ip_forwarding_daemon.in (revision 448349) @@ -0,0 +1,34 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_ip_forwarding_daemon +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd google_instance_setup google_network_setup +# KEYWORD: shutdown +# +# google_ip_forwarding_daemon_enable (bool): Set to NO by default. +# Set it to YES to enable google_ip_forwarding_daemon. +# + +. /etc/rc.subr + +name="google_ip_forwarding_daemon" +rcvar="google_ip_forwarding_daemon_enable" + +load_rc_config "${name}" + +: ${google_ip_forwarding_daemon_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}.pid +start_cmd="google_ip_forwarding_daemon_start" + +google_ip_forwarding_daemon_start() +{ + check_startmsgs && echo "Starting ${name}." + daemon -p ${pidfile} -t ${name} ${command} +} + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_ip_forwarding_daemon.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_network_setup.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_network_setup.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_network_setup.in (revision 448349) @@ -0,0 +1,26 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_network_setup +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd google_instance_setup +# +# google_network_setup_enable (bool): Set to NO by default. +# Set it to YES to enable google_network_setup. +# + +. /etc/rc.subr + +name="google_network_setup" +rcvar="google_network_setup_enable" + +load_rc_config "${name}" + +: ${google_network_setup_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/${name} +pidfile=/var/run/${name}.pid + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_network_setup.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/google_startup.in =================================================================== --- head/sysutils/py-google-compute-engine/files/google_startup.in (nonexistent) +++ head/sysutils/py-google-compute-engine/files/google_startup.in (revision 448349) @@ -0,0 +1,42 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: google_startup +# BEFORE: LOGIN +# REQUIRE: NETWORKING syslogd google_instance_setup google_network_setup +# KEYWORD: shutdown +# +# google_startup_enable (bool): Set to NO by default. +# Set it to YES to enable google_startup. +# + +. /etc/rc.subr + +name="google_startup" +rcvar="google_startup_enable" + +load_rc_config "${name}" + +: ${google_startup_enable:="NO"} + +command_interpreter="%%PYTHON_CMD%%" +command=%%PREFIX%%/bin/google_metadata_script_runner +command_startup_args="--script-type startup" +command_shutdown_args="--script-type shutdown" +pidfile=/var/run/${name}.pid +start_cmd="google_startup_start" +stop_cmd="google_startup_stop" + +google_startup_start() +{ + ${command} ${command_startup_args} +} + +google_startup_stop() +{ + echo "Stopping ${name}." + ${command} ${command_shutdown_args} +} + +run_rc_command "$1" Property changes on: head/sysutils/py-google-compute-engine/files/google_startup.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__daemon.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__daemon.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__daemon.py (revision 448349) @@ -0,0 +1,14 @@ +This patch won't be necessary anymore in further versions. +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/accounts/accounts_daemon.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/accounts/accounts_daemon.py +@@ -27,7 +27,7 @@ from google_compute_engine import logger + from google_compute_engine import metadata_watcher + from google_compute_engine.accounts import accounts_utils + +-LOCKFILE = '/var/lock/google_accounts.lock' ++LOCKFILE = '/var/spool/lock/google_accounts.lock' + + + class AccountsDaemon(object): Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__daemon.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__utils.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__utils.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__utils.py (revision 448349) @@ -0,0 +1,52 @@ +This patch won't be necessary anymore in further versions. +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/accounts/accounts_utils.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/accounts/accounts_utils.py +@@ -43,8 +43,8 @@ class AccountsUtils(object): + """ + self.logger = logger + self.google_sudoers_group = 'google-sudoers' +- self.google_sudoers_file = '/etc/sudoers.d/google_sudoers' +- self.google_users_dir = '/var/lib/google' ++ self.google_sudoers_file = '%%PREFIX%%/etc/sudoers.d/google_sudoers' ++ self.google_users_dir = '%%PREFIX%%/var/lib/google' + self.google_users_file = os.path.join(self.google_users_dir, 'google_users') + + self._CreateSudoersGroup() +@@ -71,7 +71,7 @@ class AccountsUtils(object): + """Create a Linux group for Google added sudo user accounts.""" + if not self._GetGroup(self.google_sudoers_group): + try: +- subprocess.check_call(['groupadd', self.google_sudoers_group]) ++ subprocess.check_call(['pw', 'groupadd', self.google_sudoers_group]) + except subprocess.CalledProcessError as e: + self.logger.warning('Could not create the sudoers group. %s.', str(e)) + +@@ -126,7 +126,7 @@ class AccountsUtils(object): + # + # To solve the issue, make the password '*' which is also recognized + # as locked but does not prevent SSH login. +- command = ['useradd', '-m', '-s', '/bin/bash', '-p', '*', user] ++ command = ['pw', 'useradd', user, '-m'] + try: + subprocess.check_call(command) + except subprocess.CalledProcessError as e: +@@ -148,7 +148,7 @@ class AccountsUtils(object): + """ + groups = ','.join(groups) + self.logger.debug('Updating user %s with groups %s.', user, groups) +- command = ['usermod', '-G', groups, user] ++ command = ['pw', 'usermod', user, '-G', groups] + try: + subprocess.check_call(command) + except subprocess.CalledProcessError as e: +@@ -317,7 +317,7 @@ class AccountsUtils(object): + """ + self.logger.info('Removing user %s.', user) + if self.remove: +- command = ['userdel', '-r', user] ++ command = ['pw', 'userdel', user, '-r'] + try: + subprocess.check_call(command) + except subprocess.CalledProcessError as e: Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_accounts_accounts__utils.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_boto__config.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_boto__config.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_boto__config.py (revision 448349) @@ -0,0 +1,27 @@ +This patch won't be necessary anymore in further versions. +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/boto/boto_config.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/boto/boto_config.py +@@ -18,8 +18,8 @@ + If a project ID is not provided, this request the project ID from the + metadata server and install the compute authentication plugin. + +-Note the config starts with the content in /etc/boto.cfg.template, +-overrides settings, and then persists it into /etc/boto.cfg. This ++Note the config starts with the content in %%PREFIX%%/etc/boto.cfg.template, ++overrides settings, and then persists it into %%PREFIX%%/etc/boto.cfg. This + is done so that the system boto.cfg can be removed prior to image + packaging. + """ +@@ -34,8 +34,8 @@ from google_compute_engine import metada + class BotoConfig(object): + """Creates a boto config file for standalone GSUtil.""" + +- boto_config = '/etc/boto.cfg' +- boto_config_template = '/etc/boto.cfg.template' ++ boto_config = '%%PREFIX%%/etc/boto.cfg' ++ boto_config_template = '%%PREFIX%%/etc/boto.cfg.template' + boto_config_script = os.path.abspath(__file__) + boto_config_header = ( + 'This file is automatically created at boot time by the %s script. Do ' Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_boto__config.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_compute__auth.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_compute__auth.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_compute__auth.py (revision 448349) @@ -0,0 +1,13 @@ +This is only a cosmetic patch as it fixes docs and not execution + +--- google_compute_engine/boto/compute_auth.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/boto/compute_auth.py +@@ -29,7 +29,7 @@ GS_SCOPES = set([ + class ComputeAuth(auth_handler.AuthHandler): + """Google Compute service account auth handler. + +- The boto library reads the system config file (/etc/boto.cfg) and looks ++ The boto library reads the system config file (%%PREFIX%%/etc/boto.cfg) and looks + at a config value called 'plugin_directory'. It then loads the Python + files and find classes derived from boto.auth_handler.AuthHandler. + """ Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_boto_compute__auth.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py (revision 448349) @@ -0,0 +1,28 @@ +BSD doesn't have hwclock, use ntpdate instead + +--- google_compute_engine/clock_skew/clock_skew_daemon.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/clock_skew/clock_skew_daemon.py +@@ -24,7 +24,7 @@ from google_compute_engine import file_u + from google_compute_engine import logger + from google_compute_engine import metadata_watcher + +-LOCKFILE = '/var/lock/google_clock_skew.lock' ++LOCKFILE = '/var/spool/lock/google_clock_skew.lock' + + + class ClockSkewDaemon(object): +@@ -58,9 +58,12 @@ class ClockSkewDaemon(object): + response: string, the metadata response with the new drift token value. + """ + self.logger.info('Clock drift token has changed: %s.', response) +- command = ['/sbin/hwclock', '--hctosys'] ++ ++ ntpd_inactive = subprocess.call(['service', 'ntpd', 'status']) + try: +- subprocess.check_call(command) ++ if not ntpd_inactive: subprocess.check_call(['service', 'ntpd', 'stop']) ++ subprocess.check_call('ntpdate `awk \'$1=="server" {print $2}\' /etc/ntp.conf`', shell=True) ++ if not ntpd_inactive: subprocess.check_call(['service', 'ntpd', 'start']) + except subprocess.CalledProcessError: + self.logger.warning('Failed to sync system time with hardware clock.') + else: Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_clock__skew_clock__skew__daemon.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_config__manager.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_config__manager.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_config__manager.py (revision 448349) @@ -0,0 +1,23 @@ +This patch won't be necessary anymore in further versions. +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/config_manager.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/config_manager.py +@@ -21,7 +21,7 @@ import textwrap + from google_compute_engine import file_utils + from google_compute_engine.compat import parser + +-CONFIG = '/etc/default/instance_configs.cfg' ++CONFIG = '%%PREFIX%%/etc/instance_configs.cfg' + + + class ConfigManager(object): +@@ -101,7 +101,7 @@ class ConfigManager(object): + """ + config_file = config_file or self.config_file + config_name = os.path.splitext(os.path.basename(config_file))[0] +- config_lock = '/var/lock/google_%s.lock' % config_name ++ config_lock = '/var/spool/lock/google_%s.lock' % config_name + with file_utils.LockFile(config_lock): + with open(config_file, 'w') as config_fp: + if self.config_header: Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_config__manager.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py (revision 448349) @@ -0,0 +1,49 @@ +This patch fixes the paths and disable optimization scripts used only on Linux. +The variables won't be needed to be fixed in further versions +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/instance_setup/instance_config.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/instance_setup/instance_config.py +@@ -16,8 +16,8 @@ + """A library used to set up the instance's default configurations file. + + Note that the configurations in +-/etc/default/instance_configs.cfg.template override the values set in +-/etc/default/instance_configs.cfg. The system instance_configs.cfg may be ++%%PREFIX%%/etc/instance_configs.cfg.template override the values set in ++%%PREFIX%%/etc/instance_configs.cfg. The system instance_configs.cfg may be + overridden during package upgrade. + """ + +@@ -32,7 +32,7 @@ from google_compute_engine.compat import + class InstanceConfig(config_manager.ConfigManager): + """Creates a defaults config file for instance configuration.""" + +- instance_config = '/etc/default/instance_configs.cfg' ++ instance_config = '%%PREFIX%%/etc/instance_configs.cfg' + instance_config_distro = '%s.distro' % instance_config + instance_config_template = '%s.template' % instance_config + instance_config_script = os.path.abspath(__file__) +@@ -40,7 +40,7 @@ class InstanceConfig(config_manager.Conf + 'This file is automatically created at boot time by the %s script. Do ' + 'not edit this file directly. If you need to add items to this file, ' + 'create or edit %s instead and then run ' +- '/usr/bin/google_instance_setup.') ++ '%%PREFIX%%/bin/google_instance_setup.') + instance_config_options = { + 'Accounts': { + 'deprovision_remove': 'false', +@@ -55,11 +55,11 @@ class InstanceConfig(config_manager.Conf + 'instance_id': '0', + }, + 'InstanceSetup': { +- 'optimize_local_ssd': 'true', ++ 'optimize_local_ssd': 'false', + 'network_enabled': 'true', + 'set_boto_config': 'true', + 'set_host_keys': 'true', +- 'set_multiqueue': 'true', ++ 'set_multiqueue': 'false', + }, + 'IpForwarding': { + 'ethernet_proto_id': '66', Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py (revision 448349) @@ -0,0 +1,26 @@ +This patch fixes paths to rc scripts +The PREFIX fix won't be necessary anymore in further versions +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/instance_setup/instance_setup.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/instance_setup/instance_setup.py +@@ -143,14 +143,14 @@ class InstanceSetup(object): + """Initialize the SSH daemon.""" + # Exit as early as possible. + # Instance setup systemd scripts block sshd from starting. +- if os.path.exists('/bin/systemctl'): ++ if os.path.exists('%%PREFIX%%/bin/systemctl'): + return +- elif (os.path.exists('/etc/init.d/ssh') or +- os.path.exists('/etc/init/ssh.conf')): ++ elif (os.path.exists('/etc/rc.d/ssh') or ++ os.path.exists('/etc/rc/ssh.conf')): + subprocess.call(['service', 'ssh', 'start']) + subprocess.call(['service', 'ssh', 'reload']) +- elif (os.path.exists('/etc/init.d/sshd') or +- os.path.exists('/etc/init/sshd.conf')): ++ elif (os.path.exists('/etc/rc.d/sshd') or ++ os.path.exists('/etc/rc/sshd.conf')): + subprocess.call(['service', 'sshd', 'start']) + subprocess.call(['service', 'sshd', 'reload']) + Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py (revision 448349) @@ -0,0 +1,35 @@ +This patch depends on the follow PR from the upsteram project +https://github.com/GoogleCloudPlatform/compute-image-packages/pull/442 + +--- google_compute_engine/ip_forwarding/ip_forwarding_daemon.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/ip_forwarding/ip_forwarding_daemon.py +@@ -38,7 +38,7 @@ from google_compute_engine import networ + + from google_compute_engine.ip_forwarding import ip_forwarding_utils + +-LOCKFILE = '/var/lock/google_ip_forwarding.lock' ++LOCKFILE = '/var/spool/lock/google_ip_forwarding.lock' + + + class IpForwardingDaemon(object): +@@ -131,18 +131,18 @@ class IpForwardingDaemon(object): + Args: + result: dict, the metadata response with the new network interfaces. + """ ++ ip_addresses = [] + for network_interface in result: + mac_address = network_interface.get('mac') + interface = self.network_utils.GetNetworkInterface(mac_address) +- ip_addresses = [] + if interface: + ip_addresses.extend(network_interface.get('forwardedIps', [])) + if self.ip_aliases: + ip_addresses.extend(network_interface.get('ipAliases', [])) +- self._HandleForwardedIps(ip_addresses, interface) + else: + message = 'Network interface not found for MAC address: %s.' + self.logger.warning(message, mac_address) ++ self._HandleForwardedIps(ip_addresses, 'lo' + self.ip_forwarding_utils.proto_id) + + + def main(): Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__daemon.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py (revision 448349) @@ -0,0 +1,80 @@ +This patch depends on the follow PR from the upsteram project +https://github.com/GoogleCloudPlatform/compute-image-packages/pull/442 + +--- google_compute_engine/ip_forwarding/ip_forwarding_utils.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/ip_forwarding/ip_forwarding_utils.py +@@ -17,6 +17,8 @@ + + import re + import subprocess ++import netifaces ++import netaddr + + IP_REGEX = re.compile(r'\A(\d{1,3}\.){3}\d{1,3}\Z') + IP_ALIAS_REGEX = re.compile(r'\A(\d{1,3}\.){3}\d{1,3}/\d{1,2}\Z') +@@ -51,8 +53,8 @@ class IpForwardingUtils(object): + options.update(kwargs) + return options + +- def _RunIpRoute(self, args=None, options=None): +- """Run a command with ip route and return the response. ++ def _RunIfconfig(self, args=None, options=None): ++ """Run a command with ifconfig and return the response. + + Args: + args: list, the string ip route command args to execute. +@@ -63,7 +65,7 @@ class IpForwardingUtils(object): + """ + args = args or [] + options = options or {} +- command = ['ip', 'route'] ++ command = ['ifconfig'] + command.extend(args) + for item in options.items(): + command.extend(item) +@@ -108,10 +110,15 @@ class IpForwardingUtils(object): + Returns: + list, the IP address strings. + """ +- args = ['ls', 'table', 'local', 'type', 'local'] +- options = self._CreateRouteOptions(dev=interface) +- result = self._RunIpRoute(args=args, options=options) +- return self.ParseForwardedIps(result.split()) ++ try: ++ ips = netifaces.ifaddresses('lo' + self.proto_id) ++ ips = ips[netifaces.AF_INET] ++ except (ValueError, KeyError) as e: ++ return [] ++ forwarded_ips = [] ++ for ip in ips: ++ forwarded_ips.append(ip['addr'] + '/' + str(netaddr.IPAddress(ip['netmask']).netmask_bits())) ++ return self.ParseForwardedIps(forwarded_ips) + + def AddForwardedIp(self, address, interface): + """Configure a new IP address on the network interface. +@@ -121,9 +128,12 @@ class IpForwardingUtils(object): + interface: string, the output device to use. + """ + address = address if IP_ALIAS_REGEX.match(address) else '%s/32' % address +- args = ['add', 'to', 'local', address] +- options = self._CreateRouteOptions(dev=interface) +- self._RunIpRoute(args=args, options=options) ++ cmd = 'alias' ++ try: ++ forwarded_ips = netifaces.ifaddresses(interface) ++ except (ValueError, KeyError) as e: ++ cmd = 'create' ++ self._RunIfconfig(args=[interface, cmd, address]) + + def RemoveForwardedIp(self, address, interface): + """Delete an IP address on the network interface. +@@ -132,7 +142,5 @@ class IpForwardingUtils(object): + address: string, the IP address to configure. + interface: string, the output device to use. + """ +- address = address if IP_ALIAS_REGEX.match(address) else '%s/32' % address +- args = ['delete', 'to', 'local', address] +- options = self._CreateRouteOptions(dev=interface) +- self._RunIpRoute(args=args, options=options) ++ address = address if IP_REGEX.match(address) else address[:-3] ++ self._RunIfconfig(args=[interface, '-alias', address]) Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_ip__forwarding_ip__forwarding__utils.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py (revision 448349) @@ -0,0 +1,14 @@ +This patch won't be necessary anymore in further versions. +See https://github.com/GoogleCloudPlatform/compute-image-packages/pull/440 + +--- google_compute_engine/metadata_scripts/script_executor.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/metadata_scripts/script_executor.py +@@ -50,7 +50,7 @@ class ScriptExecutor(object): + metadata_script: string, the file location of an executable script. + """ + process = subprocess.Popen( +- metadata_script, shell=True, executable='/bin/bash', ++ metadata_script, shell=True, executable='%%PREFIX%%/bin/bash', + stderr=subprocess.STDOUT, stdout=subprocess.PIPE) + while True: + for line in iter(process.stdout.readline, b''): Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_metadata__scripts_script__executor.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py (revision 448349) @@ -0,0 +1,47 @@ +dhclient works a bit different in BSD compared to Linux, this patch adapts its usage. + +--- google_compute_engine/network_setup/network_setup.py.orig 2017-07-23 07:12:16 UTC ++++ google_compute_engine/network_setup/network_setup.py +@@ -74,7 +74,7 @@ class NetworkSetup(object): + Args: + interfaces: list of string, the output device names enable. + """ +- interface_path = '/etc/sysconfig/network-scripts' ++ interface_path = '%%PREFIX%%/etc/sysconfig/network-scripts' + for interface in interfaces: + interface_config = os.path.join(interface_path, 'ifcfg-%s' % interface) + if os.path.exists(interface_config): +@@ -106,12 +106,18 @@ class NetworkSetup(object): + self.logger.info('Enabling the Ethernet interfaces %s.', interfaces) + dhclient_command = ['dhclient'] + if os.path.exists(self.dhclient_script): +- dhclient_command += ['-sf', self.dhclient_script] +- try: +- subprocess.check_call(dhclient_command + ['-x'] + interfaces) +- subprocess.check_call(dhclient_command + interfaces) +- except subprocess.CalledProcessError: +- self.logger.warning('Could not enable interfaces %s.', interfaces) ++ dhclient_conf = '/etc/dhclient.conf' ++ if os.path.exists(dhclient_conf): ++ subprocess.call('sed -i "" "/^script/d" ' + dhclient_conf, shell=True) ++ subprocess.call('echo \'script "%s";\' >> %s' % (self.dhclient_script, dhclient_conf), shell=True) ++ for interface in interfaces: ++ try: ++ subprocess.check_call(['ifconfig', interface, 'down', 'delete']) ++ # wait previous dhclient to exit ++ subprocess.check_call(['sleep', '3']) ++ subprocess.check_call(dhclient_command + [interface]) ++ except subprocess.CalledProcessError: ++ self.logger.warning('Could not enable interface %s.', interface) + + def _EnableNetworkInterfaces(self, interfaces): + """Enable the list of network interfaces. +@@ -130,7 +136,7 @@ class NetworkSetup(object): + except subprocess.CalledProcessError: + self.logger.warning('Could not enable Ethernet interfaces.') + else: +- if os.path.exists('/etc/sysconfig/network-scripts'): ++ if os.path.exists('%%PREFIX%%/etc/sysconfig/network-scripts'): + self._DisableNetworkManager(interfaces) + self._ConfigureNetwork(interfaces) + Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__setup_network__setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__utils.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__utils.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__utils.py (revision 448349) @@ -0,0 +1,30 @@ +This patch depends on the follow PR from the upsteram project +https://github.com/GoogleCloudPlatform/compute-image-packages/pull/442 + +--- google_compute_engine/network_utils.py.orig 2017-07-18 16:43:14 UTC ++++ google_compute_engine/network_utils.py +@@ -17,6 +17,7 @@ + + import logging + import os ++import netifaces + + + class NetworkUtils(object): +@@ -38,11 +39,12 @@ class NetworkUtils(object): + dict, string MAC addresses mapped to the string network interface name. + """ + interfaces = {} +- for interface in os.listdir('/sys/class/net'): ++ for interface in netifaces.interfaces(): + try: +- mac_address = open( +- '/sys/class/net/%s/address' % interface).read().strip() +- except (IOError, OSError) as e: ++ mac_address = netifaces.ifaddresses(interface)[netifaces.AF_LINK][0]['addr'] ++ if mac_address == interface: ++ raise Exception('No MAC Address') ++ except Exception as e: + message = 'Unable to determine MAC address for %s. %s.' + self.logger.warning(message, interface, str(e)) + else: Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_network__utils.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-setup.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-setup.py (nonexistent) +++ head/sysutils/py-google-compute-engine/files/patch-setup.py (revision 448349) @@ -0,0 +1,10 @@ +--- setup.py.orig 2017-07-18 16:43:14 UTC ++++ setup.py +@@ -30,7 +30,6 @@ setuptools.setup( + long_description='Google Compute Engine guest environment.', + name='google-compute-engine', + packages=setuptools.find_packages(), +- scripts=glob.glob('scripts/*'), + url='https://github.com/GoogleCloudPlatform/compute-image-packages', + version='2.4.1', + # Entry points create scripts in /usr/bin that call a function. Property changes on: head/sysutils/py-google-compute-engine/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/pkg-descr =================================================================== --- head/sysutils/py-google-compute-engine/pkg-descr (nonexistent) +++ head/sysutils/py-google-compute-engine/pkg-descr (revision 448349) @@ -0,0 +1,14 @@ +Google Compute Engine offers scripts and daemons which run in the +background and provides the following services: + +- Accounts daemon to setup and manage user accounts, and to enable SSH key based + authentication. +- Clock skew daemon to keep the system clock in sync after VM start and stop + events. +- Instance setup scripts to execute VM configuration scripts during boot. +- IP forwarding daemon that integrates network load balancing with forwarding + rule changes into the guest. +- Metadata scripts to run user provided scripts at VM startup and shutdown. +- Network setup service to enable multiple network interfaces on boot. + +WWW: https://github.com/GoogleCloudPlatform/compute-image-packages Property changes on: head/sysutils/py-google-compute-engine/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/pkg-message =================================================================== --- head/sysutils/py-google-compute-engine/pkg-message (nonexistent) +++ head/sysutils/py-google-compute-engine/pkg-message (revision 448349) @@ -0,0 +1,23 @@ + +============================================================================== + +google-compute-engine has been installed, and the following services are +available: + +google_accounts_daemon Responsible for provisioning and + deprovisioning user accounts +google_clock_skew_daemon Responsible for syncing the software clock with + the hypervisor clock +google_instance_setup Configure the guest at boot +google_ip_forwarding_daemon Responsible to setup or remove IP routes in the + guest +google_network_setup Responsible to enables all associated network + interfaces +google_startup Implement support for running host provided + startup / shutdown scripts + +To enable the above services, sysrc _enable=YES + +Reboot your system or start the services, service start + +============================================================================== Property changes on: head/sysutils/py-google-compute-engine/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property