]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'mfischer/logrotate' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:01:39 +0000 (18:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:01:39 +0000 (18:01 +0100)
Conflicts:
config/rootfiles/common/logrotate

1  2 
config/rootfiles/common/logrotate
lfs/logrotate

index 7f3e709ead13609beb54da3f87e38941ad527d58,248a624ba9233ab2042d1fb2ea095699bbb34a49..5800a048637bf37883a7920596cd49fd23dc3dfe
@@@ -1,5 -1,4 +1,6 @@@
 +#etc/logrotate.d
 +etc/logrotate.d/.empty
+ #usr/man/man5/logrotate.5
  #usr/man/man8/logrotate.8
  usr/sbin/logrotate
  var/lib/logrotate.status
diff --combined lfs/logrotate
index 8f81b2df546cac234a664b0e89c61000a75487dc,240f425485eaf9e1d228812108b0422a013c98a7..0904074ba9b0ef5f98b024e9d867b6a3d7a9c1eb
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2014  Michael Tremer & Christian Schmidt                      #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
- VER        = 3.7.1
+ VER        = 3.8.1
  
  THISAPP    = logrotate-$(VER)
  DL_FILE    = logrotate_$(VER).orig.tar.gz
@@@ -40,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = 552639142e163745f6bcd4f1f3816d8a
+ $(DL_FILE)_MD5 = bd2e20d8dc644291b08f9215397d28a5
  
  install : $(TARGET)
  
@@@ -72,7 -72,6 +72,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 -      touch /var/lib/logrotate.status
 +      mkdir -pv /etc/logrotate.d
 +      touch /etc/logrotate.d/.empty /var/lib/logrotate.status
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)