Index: head/sysutils/Makefile =================================================================== --- head/sysutils/Makefile (revision 354217) +++ head/sysutils/Makefile (revision 354218) @@ -1,1071 +1,1072 @@ # $FreeBSD$ # COMMENT = System utilities SUBDIR += 3dm SUBDIR += 44bsd-more SUBDIR += 915resolution SUBDIR += DTraceToolkit SUBDIR += LPRng SUBDIR += LPRngTool SUBDIR += abck SUBDIR += abgx360 SUBDIR += abgx360gui SUBDIR += acpi_call SUBDIR += acpica-tools SUBDIR += adtool SUBDIR += afbinit SUBDIR += afflib SUBDIR += afio SUBDIR += agedu SUBDIR += ah-tty SUBDIR += aimage SUBDIR += aird SUBDIR += am-utils SUBDIR += amrstat SUBDIR += anacron SUBDIR += and SUBDIR += ansible SUBDIR += apachetop SUBDIR += apcpwr SUBDIR += apcupsd SUBDIR += apt SUBDIR += arcconf SUBDIR += archivemount SUBDIR += areca-cli SUBDIR += asapm SUBDIR += ascpu SUBDIR += asfsm SUBDIR += asmem SUBDIR += asmon SUBDIR += asr-utils SUBDIR += asusoled SUBDIR += ataidle SUBDIR += atitvout SUBDIR += atop SUBDIR += auto-admin SUBDIR += autojump SUBDIR += automount SUBDIR += automounter SUBDIR += autopsy SUBDIR += b43-fwcutter SUBDIR += backuppc SUBDIR += bacula-bat SUBDIR += bacula-client SUBDIR += bacula-client-static SUBDIR += bacula-docs SUBDIR += bacula-server SUBDIR += bashburn SUBDIR += batmon SUBDIR += battfink SUBDIR += battmond SUBDIR += battray SUBDIR += bbapm SUBDIR += bbcp SUBDIR += bchunk SUBDIR += be_agent SUBDIR += beadm SUBDIR += beadm-devel SUBDIR += biosfont SUBDIR += bkpupsd SUBDIR += bksh SUBDIR += bontmia SUBDIR += boxbackup SUBDIR += boxbackup-devel SUBDIR += brasero SUBDIR += brebis SUBDIR += bsd-splash-changer SUBDIR += bsdadminscripts SUBDIR += bsdconfig SUBDIR += bsdcrashtar SUBDIR += bsdhwmon SUBDIR += bsdinfo SUBDIR += bsdmoted SUBDIR += bsdstats SUBDIR += bubblemon-dockapp SUBDIR += bulk_extractor SUBDIR += busybox SUBDIR += busybox-unstable SUBDIR += byobu 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 += cfengine22 SUBDIR += cfengine32 SUBDIR += cfengine33 SUBDIR += cfengine34 SUBDIR += cfengine35 SUBDIR += cfengine36 SUBDIR += chgrep SUBDIR += ciso SUBDIR += ck4up SUBDIR += clean SUBDIR += clockspeed SUBDIR += clockspeed-conf SUBDIR += clone SUBDIR += clonehdd SUBDIR += cloop-utils SUBDIR += cmdwatch SUBDIR += cmogstored SUBDIR += cmospwd SUBDIR += cog SUBDIR += colorize SUBDIR += comconsole SUBDIR += comiccron SUBDIR += condor SUBDIR += confctl SUBDIR += confman SUBDIR += conky SUBDIR += conky-awesome SUBDIR += consolehm SUBDIR += consolekit SUBDIR += contool SUBDIR += copytape SUBDIR += coreutils SUBDIR += cotty SUBDIR += cpdup SUBDIR += cpu SUBDIR += cpuburn SUBDIR += cpulimit SUBDIR += cramfs SUBDIR += crashme SUBDIR += createrepo SUBDIR += cromwell SUBDIR += cronolog SUBDIR += cronolog-devel SUBDIR += curly SUBDIR += cvsweb-converters SUBDIR += cw SUBDIR += daa2iso SUBDIR += dae SUBDIR += daedalus SUBDIR += daemontools SUBDIR += dar SUBDIR += dateutils SUBDIR += dc3dd SUBDIR += dcfldd SUBDIR += dd_rescue SUBDIR += ddpt SUBDIR += ddrescue SUBDIR += debhelper SUBDIR += debootstrap SUBDIR += deltup SUBDIR += desktop-installer SUBDIR += detach SUBDIR += detox SUBDIR += devcpu-data SUBDIR += devstat SUBDIR += dfc SUBDIR += di SUBDIR += dim SUBDIR += dirdiff SUBDIR += dirvish SUBDIR += diskcheckd SUBDIR += diskimage-tools SUBDIR += diskscrub SUBDIR += disktool SUBDIR += disktype SUBDIR += djmount SUBDIR += dmg2img SUBDIR += dmidecode SUBDIR += doinkd SUBDIR += dolly SUBDIR += downtime SUBDIR += downtimed SUBDIR += dt SUBDIR += dtpstree SUBDIR += du2ps SUBDIR += duff SUBDIR += dunst 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 += eroaster SUBDIR += etcmerge SUBDIR += etcupdate SUBDIR += eventlog SUBDIR += evtviewer SUBDIR += exfat-utils SUBDIR += extipl SUBDIR += ezjail 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-pkgs SUBDIR += flasher SUBDIR += flashrom SUBDIR += flexbackup SUBDIR += flock SUBDIR += flog SUBDIR += flyback SUBDIR += fonteditfs SUBDIR += foremost SUBDIR += fortunelock SUBDIR += fpart SUBDIR += fpc-syslog SUBDIR += fpc-users SUBDIR += fpc-utmp SUBDIR += fpc-uuid SUBDIR += fpkg SUBDIR += freebsd-snapshot SUBDIR += freecolor SUBDIR += freedt SUBDIR += freeipmi SUBDIR += freesbie SUBDIR += freqsdwn SUBDIR += froxlor SUBDIR += fsbackup SUBDIR += fsc SUBDIR += fstyp 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-gnome-vfs SUBDIR += fusefs-gstfs SUBDIR += fusefs-gunzip SUBDIR += fusefs-httpfs SUBDIR += fusefs-ifuse SUBDIR += fusefs-kmod SUBDIR += fusefs-libs SUBDIR += fusefs-mhddfs SUBDIR += fusefs-mp3fs SUBDIR += fusefs-ntfs SUBDIR += fusefs-pod SUBDIR += fusefs-rar2fs SUBDIR += fusefs-s3fs SUBDIR += fusefs-smbnetfs SUBDIR += fusefs-sqlfs 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 += geomWatch SUBDIR += geomgui SUBDIR += getdelta SUBDIR += geteltorito SUBDIR += gigolo SUBDIR += gkfreq SUBDIR += gkleds2 SUBDIR += gkrellfire SUBDIR += gkrellflynn SUBDIR += gkrellm 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-system-tools SUBDIR += gnome_subr SUBDIR += gnomebaker SUBDIR += goaccess SUBDIR += gosa SUBDIR += gpart SUBDIR += gpkgdep SUBDIR += gpte SUBDIR += graffer SUBDIR += graid5 SUBDIR += graveman SUBDIR += grok SUBDIR += grub2 SUBDIR += grub2-bhyve SUBDIR += grub2-efi SUBDIR += gsmartcontrol SUBDIR += gstopd SUBDIR += gstreamer-plugins-cdio SUBDIR += gstreamer-plugins-hal SUBDIR += gstreamer1-plugins-cdio SUBDIR += gtk-imonc SUBDIR += gtk-send-pr 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 += 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 += htop SUBDIR += httplog SUBDIR += hwstat SUBDIR += hyperic-sigar SUBDIR += i2c-tools SUBDIR += i7z SUBDIR += iat SUBDIR += installwatch SUBDIR += intel-pcm SUBDIR += iogen SUBDIR += iograph SUBDIR += ioping SUBDIR += ipa SUBDIR += ipad_charge SUBDIR += ipmitool SUBDIR += ipsc SUBDIR += isc-cron SUBDIR += isomaster SUBDIR += isomd5sum SUBDIR += ispman SUBDIR += istatd SUBDIR += jail-primer SUBDIR += jail2 SUBDIR += jailadmin SUBDIR += jailctl SUBDIR += jaildaemon SUBDIR += jailme SUBDIR += jailrc SUBDIR += jailuser SUBDIR += javaservicewrapper SUBDIR += jdiskreport SUBDIR += jfbterm SUBDIR += jkill 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 += kfloppy SUBDIR += kiconvtool SUBDIR += kldfind SUBDIR += kldpatch SUBDIR += knutclient-kde4 SUBDIR += krename-kde4 SUBDIR += kshutdown-kde4 SUBDIR += ksysguardd SUBDIR += ksystemlog SUBDIR += kuser SUBDIR += lbl-cf SUBDIR += lbl-hf SUBDIR += lcdproc SUBDIR += ldap-account-manager SUBDIR += ldapenter SUBDIR += ldapvi SUBDIR += ledit SUBDIR += less SUBDIR += lfm SUBDIR += libcdio SUBDIR += libchk SUBDIR += libfvde SUBDIR += libgksu SUBDIR += libieee1284 SUBDIR += libretto-config SUBDIR += libsunacl SUBDIR += liburcu SUBDIR += libutempter SUBDIR += libzeitgeist SUBDIR += lineak-defaultplugin SUBDIR += lineak-xosdplugin SUBDIR += lineakd SUBDIR += linrename SUBDIR += linux-afaapps SUBDIR += linux-crashplan SUBDIR += linux-f10-procps SUBDIR += linux-nero SUBDIR += linuxfdisk SUBDIR += livecd SUBDIR += lmmon SUBDIR += lmon SUBDIR += log_analysis SUBDIR += loganalyzer SUBDIR += logrotate SUBDIR += logstalgia SUBDIR += logstash SUBDIR += logtool SUBDIR += logwatch SUBDIR += lookat SUBDIR += lookupd SUBDIR += lookupd_ldap SUBDIR += lsof SUBDIR += ltrace 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-nrpe-agent SUBDIR += mcollective-puppet-agent 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 += mnrpes SUBDIR += modules SUBDIR += monit SUBDIR += monitord SUBDIR += monitorix SUBDIR += mono-kmod SUBDIR += moosefs-chunkserver SUBDIR += moosefs-client SUBDIR += moosefs-master SUBDIR += moreutils SUBDIR += moreutils-parallel 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-master SUBDIR += munin-node SUBDIR += muse SUBDIR += mybashburn SUBDIR += nagios-statd SUBDIR += namefix SUBDIR += nbosd SUBDIR += ncdu SUBDIR += nepomuk-core SUBDIR += nepomuk-widgets SUBDIR += netident SUBDIR += news SUBDIR += nfsping SUBDIR += nitrogen SUBDIR += no-login SUBDIR += npadmin SUBDIR += nrg2iso SUBDIR += ntfsprogs SUBDIR += nut SUBDIR += nut22 SUBDIR += nvclock SUBDIR += nvramtool SUBDIR += nvtv SUBDIR += oak SUBDIR += obliterate SUBDIR += ods2 SUBDIR += open SUBDIR += openipmi SUBDIR += openupsd SUBDIR += ori 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-Iterator-File SUBDIR += p5-Lchown SUBDIR += p5-Linux-Cpuinfo 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-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-Sys-Utmp 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 += pacman SUBDIR += paicc SUBDIR += pam_mount SUBDIR += panicmail SUBDIR += parallel SUBDIR += password-store SUBDIR += patchelf SUBDIR += pax-utils SUBDIR += pbimaker SUBDIR += pc-sysinstall SUBDIR += pcbsd-utils SUBDIR += pcbsd-utils-qt4 SUBDIR += pcfclock SUBDIR += pciutils SUBDIR += pcpustat SUBDIR += pdixtract SUBDIR += pdsh 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 += penv SUBDIR += personality SUBDIR += pessulus SUBDIR += pflogx SUBDIR += pfstat SUBDIR += pftop SUBDIR += phantom SUBDIR += philesight SUBDIR += php5-fileinfo SUBDIR += php5-posix SUBDIR += php53-fileinfo SUBDIR += php53-posix SUBDIR += php55-fileinfo SUBDIR += php55-posix SUBDIR += pidof SUBDIR += pipemeter SUBDIR += plasma-applet-apcups SUBDIR += plconfig SUBDIR += pmap SUBDIR += pmt SUBDIR += policykit SUBDIR += policykit-gnome SUBDIR += policykit-qt SUBDIR += polkit SUBDIR += polkit-gnome SUBDIR += polkit-kde SUBDIR += polkit-qt SUBDIR += powerman SUBDIR += pp SUBDIR += pprotectd SUBDIR += prelink SUBDIR += prips SUBDIR += procenv SUBDIR += procmap SUBDIR += progsreiserfs SUBDIR += psgconf SUBDIR += pslist SUBDIR += psmisc SUBDIR += pstack SUBDIR += pstree SUBDIR += ptools SUBDIR += puppet SUBDIR += puppet-lint SUBDIR += puppet-mode.el SUBDIR += puppet27 SUBDIR += pv SUBDIR += pwd_unmkdb SUBDIR += pwgen SUBDIR += pwsafe SUBDIR += py-XenAPI SUBDIR += py-analyzemft SUBDIR += py-bcfg2 SUBDIR += py-danzfs SUBDIR += py-drmaa SUBDIR += py-ezjailremote SUBDIR += py-filelike SUBDIR += py-glances SUBDIR += py-halite SUBDIR += py-iowait SUBDIR += py-nagiosplugin SUBDIR += py-plumbum SUBDIR += py-psutil SUBDIR += py-psutil121 SUBDIR += py-pytsk SUBDIR += py-ranger SUBDIR += py-salt SUBDIR += py-salt-api SUBDIR += py-stdiff SUBDIR += py-supervisor SUBDIR += py-zdaemon SUBDIR += py-zfs SUBDIR += pydf SUBDIR += qjail SUBDIR += qjail2 SUBDIR += qlogtools SUBDIR += qpxtool SUBDIR += qsynergy SUBDIR += quicksynergy SUBDIR += qzeitgeist SUBDIR += racktables SUBDIR += radeontool SUBDIR += radmind SUBDIR += raincoat SUBDIR += rclean SUBDIR += rdate SUBDIR += rdiff-backup SUBDIR += rdiff-backup-devel SUBDIR += rdup SUBDIR += readlink SUBDIR += realsync SUBDIR += recoverdm SUBDIR += reed SUBDIR += rej SUBDIR += relaxconf SUBDIR += rename SUBDIR += reoback SUBDIR += replicant SUBDIR += respond SUBDIR += retail SUBDIR += rfstool SUBDIR += rmonitor SUBDIR += roottail SUBDIR += rsnapshot SUBDIR += rsyncbackup SUBDIR += rsyncmanager SUBDIR += rsyncrypto SUBDIR += rsyslog7 SUBDIR += rsyslog7-devel + SUBDIR += rsyslog8 SUBDIR += rsyslog8-devel SUBDIR += rtty SUBDIR += ruby-quota SUBDIR += rubygem-SyslogLogger SUBDIR += rubygem-backup SUBDIR += rubygem-bundler SUBDIR += rubygem-capistrano SUBDIR += rubygem-capistrano-ext SUBDIR += rubygem-chef SUBDIR += rubygem-chef-expander SUBDIR += rubygem-chef-server SUBDIR += rubygem-chef-solr 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-tail-asis SUBDIR += rubygem-fluentd SUBDIR += rubygem-fssm SUBDIR += rubygem-god SUBDIR += rubygem-guard SUBDIR += rubygem-guard-livereload SUBDIR += rubygem-guard-minitest SUBDIR += rubygem-guard-rspec SUBDIR += rubygem-hammer_cli SUBDIR += rubygem-hammer_cli_foreman SUBDIR += rubygem-hiera SUBDIR += rubygem-hiera-json SUBDIR += rubygem-hiera-puppet SUBDIR += rubygem-librarian-puppet SUBDIR += rubygem-log4r SUBDIR += rubygem-mogilefs-client SUBDIR += rubygem-murder SUBDIR += rubygem-ohai SUBDIR += rubygem-parallel SUBDIR += rubygem-rubyipmi 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-teamocil SUBDIR += rubygem-yell SUBDIR += runit SUBDIR += runwhen SUBDIR += safe-rm SUBDIR += safecat SUBDIR += samefile SUBDIR += samesame SUBDIR += savelogs SUBDIR += sb16config SUBDIR += sbniconfig SUBDIR += scalpel SUBDIR += scan_ffs SUBDIR += scanbuttond SUBDIR += schedutils SUBDIR += scprotect SUBDIR += screen SUBDIR += screen-legacy SUBDIR += screenfetch SUBDIR += screenie SUBDIR += scterc SUBDIR += sdd SUBDIR += sdparm SUBDIR += searchmonkey SUBDIR += seatools SUBDIR += sec SUBDIR += serpentine SUBDIR += setcdboot SUBDIR += setquota SUBDIR += sformat SUBDIR += sg3_utils SUBDIR += shlock SUBDIR += shmcat SUBDIR += sievelog SUBDIR += skill SUBDIR += slack SUBDIR += sleuthkit SUBDIR += sloth SUBDIR += slst SUBDIR += slurm-hpc SUBDIR += smartmontools SUBDIR += smp_utils SUBDIR += snap SUBDIR += snowlog SUBDIR += socket SUBDIR += socklog SUBDIR += sortu SUBDIR += spindown SUBDIR += spinner SUBDIR += spiped SUBDIR += squashfs-tools SUBDIR += sshsudo SUBDIR += ssid SUBDIR += ssync SUBDIR += stalepid SUBDIR += stmpclean SUBDIR += stow SUBDIR += stowES SUBDIR += stress SUBDIR += su2 SUBDIR += superiotool SUBDIR += swapd SUBDIR += swapexd SUBDIR += swapmon SUBDIR += sweeper SUBDIR += symlinks SUBDIR += symon SUBDIR += synergy SUBDIR += synergy-devel SUBDIR += sysgather SUBDIR += sysinfo SUBDIR += syslinux SUBDIR += syslog-ng SUBDIR += syslog-ng-devel SUBDIR += syslog-ng-incubator SUBDIR += syslog-ng2 SUBDIR += syslog-ng33 SUBDIR += syslog-ng34 SUBDIR += syslogger SUBDIR += sysrc SUBDIR += system-tools-backends SUBDIR += sysupdate SUBDIR += sysvbanner SUBDIR += tai64nfrac SUBDIR += tarsnap SUBDIR += tbku SUBDIR += tclsyslog SUBDIR += tcplist SUBDIR += tdir SUBDIR += tenshi SUBDIR += tentakel SUBDIR += testdisk SUBDIR += thefish SUBDIR += timelimit SUBDIR += timemon SUBDIR += titlefix SUBDIR += tkdvd SUBDIR += tlsdate SUBDIR += tm SUBDIR += tmpreaper SUBDIR += tmpwatch SUBDIR += tmux SUBDIR += topless SUBDIR += torque SUBDIR += torsmo SUBDIR += toshctl SUBDIR += tracker SUBDIR += tracker-client SUBDIR += tracker-gnome SUBDIR += tracker-libtrackergtk SUBDIR += tree SUBDIR += tren SUBDIR += ts SUBDIR += tss SUBDIR += tty-clock SUBDIR += ttyload SUBDIR += tw_cli SUBDIR += tzdialog SUBDIR += u-boot-beaglebone-eabi SUBDIR += ua SUBDIR += ucspi-ipc SUBDIR += ucspi-proxy SUBDIR += ucspi-ssl SUBDIR += ucspi-ssl-tls SUBDIR += ucspi-tcp SUBDIR += ucspi-unix SUBDIR += udfclient SUBDIR += ufs_copy SUBDIR += uhidd SUBDIR += uif2iso SUBDIR += unieject SUBDIR += uniutils SUBDIR += unquote SUBDIR += unstow SUBDIR += upower SUBDIR += upsd SUBDIR += upsdaemon SUBDIR += uptimed SUBDIR += usb_modeswitch 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 += vcp SUBDIR += vhdtool SUBDIR += videogen SUBDIR += vii SUBDIR += vils SUBDIR += vimpager SUBDIR += virtualmin SUBDIR += vlogger SUBDIR += vmdktool SUBDIR += vobcopy SUBDIR += volman SUBDIR += vordog SUBDIR += vpnc-scripts SUBDIR += vstrip SUBDIR += vttest SUBDIR += wait_on SUBDIR += watchdog SUBDIR += watchfolder SUBDIR += watchmen SUBDIR += webjob SUBDIR += webmin SUBDIR += weedit SUBDIR += wemux SUBDIR += whatpix SUBDIR += whowatch SUBDIR += wiimms SUBDIR += wmapm SUBDIR += wmapmload SUBDIR += wmbluecpu SUBDIR += wmbsdbatt SUBDIR += wmcpuload SUBDIR += wmcube SUBDIR += wmcube-gdk SUBDIR += wmdiskmon SUBDIR += wmfire SUBDIR += wmflame SUBDIR += wmmemfree SUBDIR += wmtop SUBDIR += wmupmon SUBDIR += worldtools SUBDIR += wtail SUBDIR += wuzzah SUBDIR += x86info SUBDIR += xacpim SUBDIR += xbatt SUBDIR += xbattbar SUBDIR += xcdroast SUBDIR += xcpustate SUBDIR += xdu SUBDIR += xe-guest-utilities SUBDIR += xen-tools SUBDIR += xfburn SUBDIR += xfce4-battery-plugin SUBDIR += xfce4-cpugraph-plugin SUBDIR += xfce4-diskperf-plugin SUBDIR += xfce4-fsguard-plugin SUBDIR += xfce4-genmon-plugin SUBDIR += xfce4-minicmd-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 += xsi SUBDIR += xstow SUBDIR += xsysstats SUBDIR += xvidcap SUBDIR += yawho SUBDIR += yum SUBDIR += zeitgeist SUBDIR += zeroer SUBDIR += zetaback SUBDIR += zfs-periodic SUBDIR += zfs-replicate SUBDIR += zfs-snapshot-clean SUBDIR += zfs-snapshot-mgmt SUBDIR += zfs-stats SUBDIR += zfsnap SUBDIR += zfstools SUBDIR += zidrav SUBDIR += zisofs-tools SUBDIR += zogftw SUBDIR += zrep SUBDIR += zsd SUBDIR += zxfer .include Index: head/sysutils/rsyslog8/Makefile =================================================================== --- head/sysutils/rsyslog8/Makefile (nonexistent) +++ head/sysutils/rsyslog8/Makefile (revision 354218) @@ -0,0 +1,162 @@ +# $FreeBSD$ + +PORTNAME= rsyslog +PORTVERSION= 8.2.1 +CATEGORIES= sysutils +MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ + +MAINTAINER= brd@FreeBSD.org +COMMENT= Syslogd supporting SQL, TCP, and TLS + +BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt + +LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ + libestr.so:${PORTSDIR}/devel/libestr \ + libjson.so:${PORTSDIR}/devel/json-c \ + liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid + +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf + +PORTSCOUT= limit:^8\.2 + +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP + +DBI_DESC= LibDBI output module for rsyslog +GNUTLS_DESC= GNUTLS module for rsyslog +GSSAPI_DESC= GSS API input/output module for rsyslog +MYSQL_DESC= MySQL output module for rsyslog +PGSQL_DESC= PostgreSQL output module for rsyslog +RELP_DESC= RELP input/output module for rsyslog +RFC3195_DESC= RFC3195 input support for rsyslog +SNMP_DESC= SNMP trap sender for rsyslog + +USES= pkgconfig + +.include + +.if ${PORT_OPTIONS:MDBI} +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi +CONFIGURE_ARGS+=--enable-libdbi +PLIST_FILES+= lib/rsyslog/omlibdbi.la \ + lib/rsyslog/omlibdbi.so +.else +CONFIGURE_ARGS+=--disable-libdbi +.endif + +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt +CONFIGURE_ARGS+=--enable-gnutls +PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ + lib/rsyslog/lmnsd_gtls.so +.else +CONFIGURE_ARGS+=--disable-gnutls +.endif + +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--enable-gssapi-krb5 +PLIST_FILES+= lib/rsyslog/imgssapi.la \ + lib/rsyslog/imgssapi.so \ + lib/rsyslog/lmgssutil.la \ + lib/rsyslog/lmgssutil.so \ + lib/rsyslog/omgssapi.la \ + lib/rsyslog/omgssapi.so +.else +CONFIGURE_ARGS+=--disable-gssapi-krb5 +.endif + +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= yes +CONFIGURE_ARGS+=--enable-mysql +PLIST_FILES+= lib/rsyslog/ommysql.so \ + lib/rsyslog/ommysql.la +.else +CONFIGURE_ARGS+=--disable-mysql +.endif + +.if ${PORT_OPTIONS:MPGSQL} +USE_PGSQL= yes +CONFIGURE_ARGS+=--enable-pgsql +PLIST_FILES+= lib/rsyslog/ompgsql.so \ + lib/rsyslog/ompgsql.la +.else +CONFIGURE_ARGS+=--disable-pgsql +.endif + +.if ${PORT_OPTIONS:MRELP} +LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp +CONFIGURE_ARGS+=--enable-relp +PLIST_FILES+= lib/rsyslog/imrelp.la \ + lib/rsyslog/imrelp.so \ + lib/rsyslog/omrelp.la \ + lib/rsyslog/omrelp.so +.else +CONFIGURE_ARGS+=--disable-relp +.endif + +.if ${PORT_OPTIONS:MRFC3195} +LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging +CONFIGURE_ARGS+=--enable-rfc3195 +PLIST_FILES+= lib/rsyslog/im3195.la \ + lib/rsyslog/im3195.so +.else +CONFIGURE_ARGS+=--disable-rfc3195 +.endif + +.if ${PORT_OPTIONS:MSNMP} +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp +CONFIGURE_ARGS+=--enable-snmp +PLIST_FILES+= lib/rsyslog/omsnmp.la \ + lib/rsyslog/omsnmp.so +.else +CONFIGURE_ARGS+=--disable-snmp +.endif + +.ifdef WITH_MYSQL_MICROSECONDS +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds +.endif + +.ifdef WITH_SANE_HOSTNAME +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname +.endif + +CONFLICTS= rsyslog6-* rsyslog-[0-9].* +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include + +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif + +CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" +CFLAGS+= ${CPPFLAGS} + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + +CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench + +post-patch: + @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ + ${WRKSRC}/tools/syslogd.c + @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ + 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' + @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c + @${FIND} ${WRKSRC} -name '*.bak' -delete + +post-install: +.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so +.endfor + +.include Property changes on: head/sysutils/rsyslog8/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/rsyslog8/distinfo =================================================================== --- head/sysutils/rsyslog8/distinfo (nonexistent) +++ head/sysutils/rsyslog8/distinfo (revision 354218) @@ -0,0 +1,2 @@ +SHA256 (rsyslog-8.2.1.tar.gz) = 193901c359b8228a85dca7a6a2e715ab2b52c18a66ca9f805d4028bedff98196 +SIZE (rsyslog-8.2.1.tar.gz) = 1944225 Property changes on: head/sysutils/rsyslog8/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/pkg-plist =================================================================== --- head/sysutils/rsyslog8/pkg-plist (nonexistent) +++ head/sysutils/rsyslog8/pkg-plist (revision 354218) @@ -0,0 +1,44 @@ +lib/rsyslog/imdiag.la +lib/rsyslog/imdiag.so +lib/rsyslog/imfile.la +lib/rsyslog/imfile.so +lib/rsyslog/imklog.la +lib/rsyslog/imklog.so +lib/rsyslog/immark.la +lib/rsyslog/immark.so +lib/rsyslog/impstats.la +lib/rsyslog/impstats.so +lib/rsyslog/imtcp.la +lib/rsyslog/imtcp.so +lib/rsyslog/imudp.la +lib/rsyslog/imudp.so +lib/rsyslog/imuxsock.la +lib/rsyslog/imuxsock.so +lib/rsyslog/lmcry_gcry.la +lib/rsyslog/lmcry_gcry.so +lib/rsyslog/lmnet.la +lib/rsyslog/lmnet.so +lib/rsyslog/lmnetstrms.la +lib/rsyslog/lmnetstrms.so +lib/rsyslog/lmnsd_ptcp.la +lib/rsyslog/lmnsd_ptcp.so +lib/rsyslog/lmregexp.la +lib/rsyslog/lmregexp.so +lib/rsyslog/lmstrmsrv.la +lib/rsyslog/lmstrmsrv.so +lib/rsyslog/lmtcpclt.la +lib/rsyslog/lmtcpclt.so +lib/rsyslog/lmtcpsrv.la +lib/rsyslog/lmtcpsrv.so +lib/rsyslog/lmzlibw.la +lib/rsyslog/lmzlibw.so +lib/rsyslog/ommail.la +lib/rsyslog/ommail.so +lib/rsyslog/omstdout.la +lib/rsyslog/omstdout.so +lib/rsyslog/omtesting.la +lib/rsyslog/omtesting.so +man/man5/rsyslog.conf.5.gz +man/man8/rsyslogd.8.gz +sbin/rsyslogd +@dirrmtry lib/rsyslog Property changes on: head/sysutils/rsyslog8/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/rsyslogd.in =================================================================== --- head/sysutils/rsyslog8/files/rsyslogd.in (nonexistent) +++ head/sysutils/rsyslog8/files/rsyslogd.in (revision 354218) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $FreeBSD$ +# + + +# PROVIDE: rsyslogd +# REQUIRE: mountcritremote cleanvar newsyslog ldconfig +# BEFORE: SERVERS + +. /etc/rc.subr + +name=rsyslogd +rcvar=rsyslogd_enable +command="%%PREFIX%%/sbin/${name}" +load_rc_config $name +: ${rsyslogd_enable:="NO"} +: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"} +: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"} +pidfile="${rsyslogd_pidfile}" +command_args="-i ${pidfile} -f ${rsyslogd_config}" +required_files="${rsyslogd_config}" +extra_commands="reload" + +run_rc_command "$1" Property changes on: head/sysutils/rsyslog8/files/rsyslogd.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/rsyslog8/files/extra-patch-mysql-microseconds =================================================================== --- head/sysutils/rsyslog8/files/extra-patch-mysql-microseconds (nonexistent) +++ head/sysutils/rsyslog8/files/extra-patch-mysql-microseconds (revision 354218) @@ -0,0 +1,56 @@ +--- ./runtime/datetime.c.orig 2010-05-04 18:57:25.588028725 -0400 ++++ ./runtime/datetime.c 2010-05-04 18:59:12.390680038 -0400 +@@ -644,18 +644,30 @@ + pBuf[1] = (ts->year / 100) % 10 + '0'; + pBuf[2] = (ts->year / 10) % 10 + '0'; + pBuf[3] = ts->year % 10 + '0'; +- pBuf[4] = (ts->month / 10) % 10 + '0'; +- pBuf[5] = ts->month % 10 + '0'; +- pBuf[6] = (ts->day / 10) % 10 + '0'; +- pBuf[7] = ts->day % 10 + '0'; +- pBuf[8] = (ts->hour / 10) % 10 + '0'; +- pBuf[9] = ts->hour % 10 + '0'; +- pBuf[10] = (ts->minute / 10) % 10 + '0'; +- pBuf[11] = ts->minute % 10 + '0'; +- pBuf[12] = (ts->second / 10) % 10 + '0'; +- pBuf[13] = ts->second % 10 + '0'; +- pBuf[14] = '\0'; +- return 15; ++ pBuf[4] = '-'; ++ pBuf[5] = (ts->month / 10) % 10 + '0'; ++ pBuf[6] = ts->month % 10 + '0'; ++ pBuf[7] = '-'; ++ pBuf[8] = (ts->day / 10) % 10 + '0'; ++ pBuf[9] = ts->day % 10 + '0'; ++ pBuf[10] = ' '; ++ pBuf[11] = (ts->hour / 10) % 10 + '0'; ++ pBuf[12] = ts->hour % 10 + '0'; ++ pBuf[13] = ':'; ++ pBuf[14] = (ts->minute / 10) % 10 + '0'; ++ pBuf[15] = ts->minute % 10 + '0'; ++ pBuf[16] = ':'; ++ pBuf[17] = (ts->second / 10) % 10 + '0'; ++ pBuf[18] = ts->second % 10 + '0'; ++ pBuf[19] = '.'; ++ pBuf[20] = (ts->secfrac / 100000) % 10 + '0'; ++ pBuf[21] = (ts->secfrac / 10000) % 10 + '0'; ++ pBuf[22] = (ts->secfrac / 1000) % 10 + '0'; ++ pBuf[23] = (ts->secfrac / 100) % 10 + '0'; ++ pBuf[24] = (ts->secfrac / 10) % 10 + '0'; ++ pBuf[25] = ts->secfrac % 10 + '0'; ++ pBuf[26] = '\0'; ++ return 26; + + } + +--- ./runtime/msg.c.orig 2010-05-04 19:00:20.241528788 -0400 ++++ ./runtime/msg.c 2010-05-04 19:00:06.136349680 -0400 +@@ -1293,7 +1293,7 @@ + case tplFmtMySQLDate: + MsgLock(pM); + if(pM->pszTIMESTAMP_MySQL == NULL) { +- if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) { ++ if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) { + MsgUnlock(pM); + return ""; + } Property changes on: head/sysutils/rsyslog8/files/extra-patch-mysql-microseconds ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/extra-patch-sane-hostname =================================================================== --- head/sysutils/rsyslog8/files/extra-patch-sane-hostname (nonexistent) +++ head/sysutils/rsyslog8/files/extra-patch-sane-hostname (revision 354218) @@ -0,0 +1,40 @@ +--- ./tools/syslogd.c.orig 2010-05-04 19:02:05.548362478 -0400 ++++ ./tools/syslogd.c 2010-05-04 19:02:27.452450741 -0400 +@@ -2611,37 +2611,6 @@ + net.getLocalHostname(&LocalFQDNName); + CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName)); + glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */ +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { +- *p++ = '\0'; +- LocalDomain = p; +- } else { +- LocalDomain = (uchar*)""; +- +- /* It's not clearly defined whether gethostname() +- * should return the simple hostname or the fqdn. A +- * good piece of software should be aware of both and +- * we want to distribute good software. Joey +- * +- * Good software also always checks its return values... +- * If syslogd starts up before DNS is up & /etc/hosts +- * doesn't have LocalHostName listed, gethostbyname will +- * return NULL. +- */ +- /* TODO: gethostbyname() is not thread-safe, but replacing it is +- * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25 +- */ +- hent = gethostbyname((char*)LocalHostName); +- if(hent) { +- free(LocalHostName); +- CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); +- +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) +- { +- *p++ = '\0'; +- LocalDomain = p; +- } +- } +- } + + /* Convert to lower case to recognize the correct domain laterly */ + for(p = LocalDomain ; *p ; p++) Property changes on: head/sysutils/rsyslog8/files/extra-patch-sane-hostname ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/pkg-message.in =================================================================== --- head/sysutils/rsyslog8/files/pkg-message.in (nonexistent) +++ head/sysutils/rsyslog8/files/pkg-message.in (revision 354218) @@ -0,0 +1,25 @@ +=================================================================== +To start using rsyslogd(8), stop syslogd(8) if it's running and +add the following lines to rc.conf(5): + + syslogd_enable="NO" + rsyslogd_enable="YES" + +It's recommended to copy syslog.conf(5) to +%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add +this: + + rsyslogd_config="/etc/syslog.conf" + +Add the following (3) lines to the beginning of the config file, for +basic functionality: + + $ModLoad immark.so # provides --MARK-- message capability + $ModLoad imuxsock.so # provides support for local system logging + $ModLoad imklog.so # kernel logging + +newsyslog(8) has the path of syslogd's pid file hardcoded. To +make it work seamlessly with rsyslog, add this: + + rsyslogd_pidfile="/var/run/syslog.pid" +=================================================================== Property changes on: head/sysutils/rsyslog8/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/patch-runtime--libgcry.c =================================================================== --- head/sysutils/rsyslog8/files/patch-runtime--libgcry.c (nonexistent) +++ head/sysutils/rsyslog8/files/patch-runtime--libgcry.c (revision 354218) @@ -0,0 +1,20 @@ +--- runtime/libgcry.c.ori 2013-05-24 20:24:27.000000000 -0600 ++++ runtime/libgcry.c 2013-05-24 20:24:52.000000000 -0600 +@@ -171,7 +171,7 @@ + * no matter what happens. + */ + static void +-eiClose(gcryfile gf, off64_t offsLogfile) ++eiClose(gcryfile gf, off_t offsLogfile) + { + char offs[21]; + size_t len; +@@ -213,7 +213,7 @@ + } + + int +-gcryfileDestruct(gcryfile gf, off64_t offsLogfile) ++gcryfileDestruct(gcryfile gf, off_t offsLogfile) + { + int r = 0; + if(gf == NULL) Property changes on: head/sysutils/rsyslog8/files/patch-runtime--libgcry.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/patch-runtime--lmcry_gcry.c =================================================================== --- head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c (nonexistent) +++ head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c (revision 354218) @@ -0,0 +1,11 @@ +--- runtime/lmcry_gcry.c.ori 2013-05-24 20:25:10.000000000 -0600 ++++ runtime/lmcry_gcry.c 2013-05-24 20:25:25.000000000 -0600 +@@ -216,7 +216,7 @@ + } + + static rsRetVal +-OnFileClose(void *pF, off64_t offsLogfile) ++OnFileClose(void *pF, off_t offsLogfile) + { + DEFiRet; + gcryfileDestruct(pF, offsLogfile); Property changes on: head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/patch-runtime--queue.c =================================================================== --- head/sysutils/rsyslog8/files/patch-runtime--queue.c (nonexistent) +++ head/sysutils/rsyslog8/files/patch-runtime--queue.c (revision 354218) @@ -0,0 +1,11 @@ +--- runtime/queue.c.ori 2013-05-24 20:22:54.000000000 -0600 ++++ runtime/queue.c 2013-05-24 20:23:07.000000000 -0600 +@@ -1449,7 +1449,7 @@ + DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem) + { + int i; +- off64_t bytesDel; ++ off_t bytesDel; + DEFiRet; + + ISOBJ_TYPE_assert(pThis, qqueue); Property changes on: head/sysutils/rsyslog8/files/patch-runtime--queue.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/files/patch-runtime--stream.h =================================================================== --- head/sysutils/rsyslog8/files/patch-runtime--stream.h (nonexistent) +++ head/sysutils/rsyslog8/files/patch-runtime--stream.h (revision 354218) @@ -0,0 +1,10 @@ +--- runtime/stream.h.ori 2013-05-24 20:21:51.000000000 -0600 ++++ runtime/stream.h 2013-05-24 20:21:11.000000000 -0600 +@@ -207,6 +207,6 @@ + + /* prototypes */ + PROTOTYPEObjClassInit(strm); +-rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off64_t offs, off64_t *bytesDel); ++rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off_t offs, off_t *bytesDel); + + #endif /* #ifndef STREAM_H_INCLUDED */ Property changes on: head/sysutils/rsyslog8/files/patch-runtime--stream.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8/pkg-descr =================================================================== --- head/sysutils/rsyslog8/pkg-descr (nonexistent) +++ head/sysutils/rsyslog8/pkg-descr (revision 354218) @@ -0,0 +1,19 @@ +Rsyslog is an enhanced multi-threaded syslogd with a focus on +security and reliability. + +Among others, it offers support for on-demand disk buffering, +reliable syslog over TCP, SSL, TLS and RELP, writing to databases +(MySQL, PostgreSQL, Oracle, and many more), email alerting, fully +configurable output formats (including high-precision timestamps), +the ability to filter on any part of the syslog message, on-the-wire +message compression, and the ability to convert text files to syslog. + +It is a drop-in replacement for stock syslogd and able to work with +the same configuration file syntax. Its advanced features make it +suitable for enterprise-class, encryption protected syslog relay +chains while at the same time being very easy to setup for the +novice user. + +Tracking v7-devel + +WWW: http://www.rsyslog.com/ Property changes on: head/sysutils/rsyslog8/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8-devel/Makefile =================================================================== --- head/sysutils/rsyslog8-devel/Makefile (revision 354217) +++ head/sysutils/rsyslog8-devel/Makefile (revision 354218) @@ -1,169 +1,163 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.1.6 +PORTVERSION= 8.3.2 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ libestr.so:${PORTSDIR}/devel/libestr \ libjson.so:${PORTSDIR}/devel/json-c \ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf -PORTSCOUT= limit:^8\.1 -PORTDOCS= * -PORTEXAMPLES= * +PORTSCOUT= limit:^8\.3 PKGNAMESUFFIX= 8-devel OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog GSSAPI_DESC= GSS API input/output module for rsyslog MYSQL_DESC= MySQL output module for rsyslog PGSQL_DESC= PostgreSQL output module for rsyslog RELP_DESC= RELP input/output module for rsyslog RFC3195_DESC= RFC3195 input support for rsyslog SNMP_DESC= SNMP trap sender for rsyslog USES= pkgconfig .include .if ${PORT_OPTIONS:MDBI} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so .else CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so .else CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--enable-gssapi-krb5 PLIST_FILES+= lib/rsyslog/imgssapi.la \ lib/rsyslog/imgssapi.so \ lib/rsyslog/lmgssutil.la \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.la \ lib/rsyslog/omgssapi.so .else CONFIGURE_ARGS+=--disable-gssapi-krb5 .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_FILES+= lib/rsyslog/ommysql.so \ - lib/rsyslog/ommysql.la + lib/rsyslog/ommysql.la .else CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so \ - lib/rsyslog/ompgsql.la + lib/rsyslog/ompgsql.la .else CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.la \ lib/rsyslog/omrelp.so .else CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so .else CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so .else CONFIGURE_ARGS+=--disable-snmp .endif .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif CONFLICTS= rsyslog6-* rsyslog-[0-9].* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif .include .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: - @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/ - @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR} -.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail +.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt mmexternal immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so .endfor .include Index: head/sysutils/rsyslog8-devel/distinfo =================================================================== --- head/sysutils/rsyslog8-devel/distinfo (revision 354217) +++ head/sysutils/rsyslog8-devel/distinfo (revision 354218) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.1.6.tar.gz) = 7505609b461813e5fea1168d386e4d07e3678c923c2b449684e95d07b6b71849 -SIZE (rsyslog-8.1.6.tar.gz) = 2633711 +SHA256 (rsyslog-8.3.2.tar.gz) = 544593192651fbf7e758068c94c7e0aad3871970700916231f94efd32fc80139 +SIZE (rsyslog-8.3.2.tar.gz) = 1962748 Index: head/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c =================================================================== --- head/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c (nonexistent) +++ head/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c (revision 354218) @@ -0,0 +1,11 @@ +--- ./plugins/mmexternal/mmexternal.c.orig 2014-05-15 11:34:32.462046745 -0600 ++++ ./plugins/mmexternal/mmexternal.c 2014-05-15 11:34:44.101043805 -0600 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "conf.h" + #include "syslogd-types.h" Property changes on: head/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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/rsyslog8-devel/pkg-plist =================================================================== --- head/sysutils/rsyslog8-devel/pkg-plist (revision 354217) +++ head/sysutils/rsyslog8-devel/pkg-plist (revision 354218) @@ -1,44 +1,46 @@ lib/rsyslog/imdiag.la lib/rsyslog/imdiag.so lib/rsyslog/imfile.la lib/rsyslog/imfile.so lib/rsyslog/imklog.la lib/rsyslog/imklog.so lib/rsyslog/immark.la lib/rsyslog/immark.so lib/rsyslog/impstats.la lib/rsyslog/impstats.so lib/rsyslog/imtcp.la lib/rsyslog/imtcp.so lib/rsyslog/imudp.la lib/rsyslog/imudp.so lib/rsyslog/imuxsock.la lib/rsyslog/imuxsock.so lib/rsyslog/lmcry_gcry.la lib/rsyslog/lmcry_gcry.so lib/rsyslog/lmnet.la lib/rsyslog/lmnet.so lib/rsyslog/lmnetstrms.la lib/rsyslog/lmnetstrms.so lib/rsyslog/lmnsd_ptcp.la lib/rsyslog/lmnsd_ptcp.so lib/rsyslog/lmregexp.la lib/rsyslog/lmregexp.so lib/rsyslog/lmstrmsrv.la lib/rsyslog/lmstrmsrv.so lib/rsyslog/lmtcpclt.la lib/rsyslog/lmtcpclt.so lib/rsyslog/lmtcpsrv.la lib/rsyslog/lmtcpsrv.so lib/rsyslog/lmzlibw.la lib/rsyslog/lmzlibw.so +lib/rsyslog/mmexternal.la +lib/rsyslog/mmexternal.so lib/rsyslog/ommail.la lib/rsyslog/ommail.so lib/rsyslog/omstdout.la lib/rsyslog/omstdout.so lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so man/man5/rsyslog.conf.5.gz man/man8/rsyslogd.8.gz sbin/rsyslogd @dirrmtry lib/rsyslog