Permalink
Browse files

Merge our PC-BSD specific bits into the 'master' branch to get

ready for some 10-STABLE builds :)
  • Loading branch information...
1 parent aa68cbc commit 90834e2a30b0556294613f8dfe52e50b4855d84d @kmoore134 kmoore134 committed Sep 11, 2013
Showing with 11,127 additions and 55 deletions.
  1. +3 −0 etc/Makefile
  2. +17 −1 etc/csh.cshrc
  3. +1 −1 etc/defaults/periodic.conf
  4. +1 −1 etc/defaults/rc.conf
  5. +4 −4 etc/freebsd-update.conf
  6. +8 −0 etc/make.conf
  7. +12 −3 etc/profile
  8. +63 −10 etc/rc
  9. +173 −0 etc/rc.conf.pcbsd
  10. +98 −0 etc/rc.delay
  11. +10 −1 etc/rc.resume
  12. +1 −3 etc/rc.subr
  13. +1 −1 etc/root/dot.cshrc
  14. +1 −1 etc/root/dot.profile
  15. +43 −1 etc/sysctl.conf
  16. +1 −0 lib/libpam/modules/modules.inc
  17. +27 −0 lib/libpam/modules/pam_pefs/Makefile
  18. +147 −0 lib/libpam/modules/pam_pefs/pam_pefs.8
  19. +526 −0 lib/libpam/modules/pam_pefs/pam_pefs.c
  20. +1 −0 sbin/Makefile
  21. +24 −0 sbin/pefs/Makefile
  22. +466 −0 sbin/pefs/pefs.8
  23. +1,173 −0 sbin/pefs/pefs_ctl.c
  24. +114 −0 sbin/pefs/pefs_ctl.h
  25. +386 −0 sbin/pefs/pefs_key.c
  26. +282 −0 sbin/pefs/pefs_keychain.c
  27. +48 −0 sbin/pefs/pefs_keychain.h
  28. +113 −0 sbin/pefs/pefs_subr.c
  29. +13 −9 sys/amd64/conf/GENERIC
  30. +2 −2 sys/conf/newvers.sh
  31. +179 −0 sys/crypto/hmac/hmac.c
  32. +55 −0 sys/crypto/hmac/hmac.h
  33. +128 −0 sys/crypto/pkcs5v2/pkcs5v2.c
  34. +36 −0 sys/crypto/pkcs5v2/pkcs5v2.h
  35. +8 −8 sys/crypto/sha2/sha2.c
  36. +2 −0 sys/fs/nullfs/null_subr.c
  37. +282 −0 sys/fs/pefs/pefs.h
  38. +220 −0 sys/fs/pefs/pefs_aesni.c
  39. +43 −0 sys/fs/pefs/pefs_aesni.h
  40. +754 −0 sys/fs/pefs/pefs_crypto.c
  41. +92 −0 sys/fs/pefs/pefs_crypto.h
  42. +394 −0 sys/fs/pefs/pefs_dircache.c
  43. +97 −0 sys/fs/pefs/pefs_dircache.h
  44. +704 −0 sys/fs/pefs/pefs_subr.c
  45. +465 −0 sys/fs/pefs/pefs_vfsops.c
  46. +2,674 −0 sys/fs/pefs/pefs_vnops.c
  47. +186 −0 sys/fs/pefs/pefs_xbase64.c
  48. +208 −0 sys/fs/pefs/pefs_xts.c
  49. +648 −0 sys/fs/pefs/vmac.c
  50. +96 −0 sys/fs/pefs/vmac.h
  51. +1 −0 sys/modules/Makefile
  52. +23 −0 sys/modules/pefs/Makefile
  53. +7 −1 sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  54. +66 −8 usr.sbin/freebsd-update/freebsd-update.sh
View
@@ -26,6 +26,7 @@ BIN1= crontab \
login.access \
login.conf \
mac.conf \
+ make.conf \
motd \
netconfig \
network.subr \
@@ -37,6 +38,8 @@ BIN1= crontab \
protocols \
rc \
rc.bsdextended \
+ rc.conf.pcbsd \
+ rc.delay \
rc.firewall \
rc.initdiskless \
rc.sendmail \
View
@@ -1,3 +1,19 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $
#
# System-wide .cshrc file for csh(1).
+if ( $?LANG ) then
+else
+ setenv LANG en_US.UTF-8
+endif
+#setenv LC_CTYPE en_US.UTF-8
+#setenv LC_COLLATE POSIX
+setenv EDITOR ee
+setenv PAGER less
+setenv BLOCKSIZE K
+
+# Set the MANPATH
+unsetenv MANPATH
+setenv MANPATH `manpath`
+
+# Enable the delete key
+bindkey [3~ delete-char
@@ -175,7 +175,7 @@ weekly_show_info="YES" # scripts returning 1
weekly_show_badconfig="NO" # scripts returning 2
# 310.locate
-weekly_locate_enable="YES" # Update locate weekly
+weekly_locate_enable="NO" # Update locate weekly
# 320.whatis
weekly_whatis_enable="YES" # Update whatis weekly
View
@@ -55,7 +55,7 @@ populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never
cleanvar_enable="YES" # Clean the /var directory
local_startup="/usr/local/etc/rc.d" # startup script dirs.
script_name_sep=" " # Change if your startup scripts' names contain spaces
-rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
+rc_conf_files="/etc/rc.conf.pcbsd /etc/rc.conf /etc/rc.conf.local"
# ZFS support
zfs_enable="NO" # Set to YES to automatically mount ZFS file systems
View
@@ -3,23 +3,23 @@
# Trusted keyprint. Changing this is a Bad Idea unless you've received
# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
# change it and explaining why.
-KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
+KeyPrint 771f0e6c8d9de2df1f70a2872a3d25716e6a7a50c32fc4f7ba15746cbf18ce7f
# Server or server pool from which to fetch updates. You can change
# this to point at a specific server if you want, but in most cases
# using a "nearby" server won't provide a measurable improvement in
# performance.
-ServerName update.FreeBSD.org
+ServerName fbsd-update.pcbsd.org
# Components of the base system which should be kept updated.
-Components src world kernel
+Components world kernel
# Example for updating the userland and the kernel source code only:
# Components src/base src/sys world
# Paths which start with anything matching an entry in an IgnorePaths
# statement will be ignored.
-IgnorePaths
+IgnorePaths /boot/kernel/linker.hints
# Paths which start with anything matching an entry in an IDSIgnorePaths
# statement will be ignored by "freebsd-update IDS".
View
@@ -0,0 +1,8 @@
+# Uncomment this if you want to do port builds with no interaction
+#BATCH=yes
+
+# Keep KDE4 in /usr/local, fixes sharing of icons / mime and others
+KDE4_PREFIX=/usr/local
+
+# Enable PKGNG
+WITH_PKGNG=yes
View
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/etc/profile,v 1.14 2004/06/06 11:46:27 schweikh Exp $
#
# System-wide .profile file for sh(1).
#
@@ -12,7 +12,16 @@
# You should also read the setlocale(3) man page for information
# on how to achieve more precise control of locale settings.
#
-# Check system messages
-# msgs -q
+# Read system messages
+# msgs -f
# Allow terminal messages
# mesg y
+if [ -z "$LANG" -o "$LANG" = "C" ] ; then
+ LANG="en_US.UTF-8"; export LANG
+fi
+#LC_CTYPE="en_US.UTF-8"; export LC_CTYPE
+#LC_COLLATE="POSIX"; export LC_COLLATE
+EDITOR=ee; export EDITOR
+PAGER=less; export PAGER
+BLOCKSIZE=K; export BLOCKSIZE
+
View
73 etc/rc
@@ -99,22 +99,75 @@ done
unset files local_rc
-# Now that disks are mounted, for each dir in $local_startup
-# search for init scripts that use the new rc.d semantics.
-#
-case ${local_startup} in
-[Nn][Oo] | '') ;;
-*) find_local_scripts_new ;;
-esac
+# Check if we are needing to finish up a freebsd-update
+if [ -e "/var/.freebsd-update-finish" ] ; then
+ TERM="cons25" ; export TERM
+ clear
+ echo "Installing FreeBSD updates... Please wait..."
+ /usr/sbin/freebsd-update --non-interactive install
+ if [ -e "/usr/local/bin/pc-softwaremanager" ] ; then
+ /usr/local/bin/pc-extractoverlay desktop
+ else
+ /usr/local/bin/pc-extractoverlay server
+ fi
+
+ rm /var/.freebsd-update-finish 2>/dev/null
+
+ echo "Press ENTER to continue"
+ read -t 30 tmp
+fi
-files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
-for _rc_elem in ${files}; do
+# Tickle /etc/version
+uname -r > /etc/version
+
+if [ "$fastboot_enable" = "YES" ]; then
+ # We are fast-booting
+
+ # List of rc.d scripts we will start before login
+ preLoad="/etc/rc.d/hostname /etc/rc.d/random /etc/rc.d/adjkerntz /etc/rc.d/cleanvar /etc/rc.d/hostid /etc/rc.d/ldconfig /etc/rc.d/zfs /etc/rc.d/zvol /etc/rc.d/cleartmp $fastboot_earlyrc "
+
+ # Start loopback device
+ /etc/rc.d/netif start lo0
+
+ # Run the early scripts now
+ for i in $preLoad
+ do
+ run_rc_script ${i} ${_boot}
+ done
+
+ # Check for USB mouse to start
+ mChk="ums0 ums1"
+ for i in $mChk
+ do
+ if [ -e "/dev/$i" ] ; then
+ /etc/rc.d/moused start $i
+ fi
+ done
+
+ # Start the delayed services after the login is up
+ (sleep 5; nice /bin/sh /etc/rc.delay "$_rc_elem_done$preLoad")&
+else
+ # Performing a normal startup
+
+ # Now that disks are mounted, for each dir in $local_startup
+ # search for init scripts that use the new rc.d semantics.
+ #
+
+ case ${local_startup} in
+ [Nn][Oo] | '') ;;
+ *) find_local_scripts_new ;;
+ esac
+
+ files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
+ for _rc_elem in ${files}; do
case "$_rc_elem_done" in
*" $_rc_elem "*) continue ;;
esac
run_rc_script ${_rc_elem} ${_boot}
-done
+ done
+
+fi
echo ''
date
View
@@ -0,0 +1,173 @@
+# PC-BSD rc.conf file
+#
+# WARNING - WARNING - WARNING - WARNING - WARNING - WARNING
+#
+# This file *will* be overwritten during upgrades
+# Place your local changes & overrides into /etc/rc.conf
+#
+# WARNING - WARNING - WARNING - WARNING - WARNING - WARNING
+###########################################################
+
+# Defaults for TrueOS servers
+if [ -e "/etc/defaults/trueos" ] ; then
+
+ # FSCK Enhancements
+ fsck_y_enable="YES"
+
+ # Enable pbid
+ pbid_enable="YES"
+
+ # Enable the Warden
+ warden_enable="YES"
+
+ # Load the following kernel modules
+ kld_list="libiconv libmchain msdosfs_iconv sem ntfs ntfs_iconv udf udf_iconv ext2fs pefs xfs reiserfs smbfs fdescfs linsysfs"
+
+ # Enable ntpd
+ ntpd_enable="YES"
+ ntpd_sync_on_start="YES"
+
+ # Enable IPFW for Warden
+ firewall_enable="YES"
+ firewall_type="open"
+
+ # Build linker.hints files with kldxref(8)
+ # Overwrite old linker.hints at boot
+ kldxref_enable="YES"
+ kldxref_clobber="YES"
+
+ # Enable the crash-reporter for textdumps
+ ix_textdump_enable="YES"
+ ix_diagnose_enable="YES"
+fi
+
+# Defaults for PC-BSD desktops
+if [ -e "/etc/defaults/pcbsd" ] ; then
+
+ background_dhclient="YES"
+ hostname="pcbsd"
+ compat5x_enable="YES"
+ sshd_enable="NO"
+ devd_enable="YES"
+ devfs_system_ruleset="devfsrules_common"
+ ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/kde4/lib /usr/local/lib/compat/pkg"
+
+ # Disable Sendmail by default
+ sendmail_enable="NONE"
+ sendmail_submit_enable="NO"
+ sendmail_outbound_enable="NO"
+ sendmail_msp_queue_enable="NO"
+
+ #Enable samba server
+ samba_enable="YES"
+ winbindd_enable="YES"
+
+ # Disable LPD
+ lpd_enable="NO"
+
+ # Enable CUPS
+ cupsd_enable="YES"
+ linux_enable="YES"
+
+ # FSCK Enhancements
+ fsck_y_enable="YES"
+
+ # powerd: adaptive speed while on AC power, adaptive while on battery power
+ powerd_enable="YES"
+ powerd_flags="-a hiadaptive -b adaptive" # set CPU frequency
+
+ # enable HAL / DBUS
+ dbus_enable="YES"
+ hald_enable="YES"
+
+ # Enable the firewall
+ pf_rules="/etc/pf.conf"
+ pf_enable="YES"
+ pf_flags=""
+
+ # Enable sound-support
+ mixer_enable="YES"
+
+ # Enable avahi_daemon
+ avahi_daemon_enable="YES"
+
+ # Start the swapexd daemon
+ swapexd_enable="YES"
+
+ # Enable IPV6 support
+ ipv6_activate_all_interfaces="YES"
+
+ # Enable BSDStats
+ bsdstats_enable="YES"
+
+ # Enable webcamd
+ webcamd_enable="YES"
+
+ # Disable writing syslogs to remote devices by default
+ syslogd_flags="-c -ss"
+
+ # Enable pbid
+ pbid_enable="YES"
+
+ # Enable the gdm display manager
+ gdm_enable="YES"
+
+ # Enable BlueTooth
+ hcsecd_enable="YES"
+ sdpd_enable="YES"
+
+ # Load the following kernel modules
+ kld_list="libiconv libmchain msdosfs_iconv if_bwn if_bwi bwi_v3_ucode bwn_v4_ucode runfw ng_ubt cuse4bsd sem ntfs ntfs_iconv udf udf_iconv ext2fs mmc mmcsd scd geom_uzip pefs xfs reiserfs smbfs fdescfs linsysfs iwn4965fw iwn1000fw iwn5000fw iwn5150fw iwn6000fw iwn6000g2afw iwn6000g2bfw iwn6050fw acpi_video"
+
+ # Clean out temporary files.
+ clear_tmp_enable="YES"
+ clean_tmp_X="YES"
+
+ # Run the pcbsd init service
+ pcbsdinit_enable="YES"
+
+ # Enable anacron
+ anacron_enable="YES"
+
+ # Enable fusefs
+ fusefs_enable="YES"
+
+ # Enable volmand
+ volmand_enable="YES"
+
+ # Enable pefs
+ pefs_enable="YES"
+
+ # Enable moused
+ moused_enable="YES"
+
+ # Enable fast-booting
+ fastboot_enable="YES"
+ fastboot_earlyrc="/etc/rc.d/moused /usr/local/etc/rc.d/pefs /usr/local/etc/rc.d/dbus /usr/local/etc/rc.d/hald /usr/local/etc/rc.d/gdm"
+
+ # Enable the Warden
+ warden_enable="YES"
+
+ # Enable fail2ban
+ fail2ban_enable="YES"
+
+ # Enable uhidd
+ uhidd_enable="YES"
+
+ # Enable ntpd
+ ntpd_enable="YES"
+ ntpd_sync_on_start="YES"
+
+ # Enable IPFW for Warden
+ firewall_enable="YES"
+ firewall_type="open"
+
+ # Build linker.hints files with kldxref(8)
+ # Overwrite old linker.hints at boot
+ kldxref_enable="YES"
+ kldxref_clobber="YES"
+
+ # Enable the crash-reporter for textdumps
+ ix_textdump_enable="YES"
+ ix_diagnose_enable="YES"
+fi
Oops, something went wrong.

0 comments on commit 90834e2

Please sign in to comment.