summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am7
-rw-r--r--etc/makepkg.conf.in14
-rw-r--r--etc/pacman.conf.in4
3 files changed, 16 insertions, 9 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am
index d504d7fc..58a80bdc 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -22,10 +22,9 @@ edit = sed \
-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
$(dist_sysconf_DATA): Makefile
- @echo ' ' GEN $@;
- @$(RM) $@ $@.tmp
- @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
- @mv $@.tmp $@
+ $(AM_V_at)$(RM) $@ $@.tmp
+ $(AM_V_GEN)$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+ $(AM_V_at)mv $@.tmp $@
makepkg.conf: $(srcdir)/makepkg.conf.in
pacman.conf: $(srcdir)/pacman.conf.in
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index e9152c8b..d8117a37 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -9,8 +9,8 @@
#-- The download utilities that makepkg should use to acquire sources
# Format: 'protocol::agent'
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
- 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+ 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+ 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
@@ -107,6 +107,16 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#GPGKEY=""
#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSZ=(compress -c -f)
+
+
+#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 932140f4..4c727240 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -15,11 +15,10 @@
#LogFile = @localstatedir@/log/pacman.log
#GPGDir = @sysconfdir@/pacman.d/gnupg/
HoldPkg = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst = pacman
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
+#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,7 +30,6 @@ Architecture = auto
# Misc options
#UseSyslog
-#UseDelta
#TotalDownload
CheckSpace
#VerbosePkgLists