webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-15 05:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into kernel-update

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-05-04 11:58:41 +02:00
parent 75c6309704 8f17b54f96
commit 1edfc9c33d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/openssl
View File

@@ -1116,7 +1116,6 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/dsa.3
#usr/share/man/man3/ecdsa.3
#usr/share/man/man3/engine.3
#usr/share/man/man3/err.3
#usr/share/man/man3/evp.3
#usr/share/man/man3/hmac.3
#usr/share/man/man3/i2d_ASN1_OBJECT.3
@@ -1164,6 +1163,7 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/md5.3
#usr/share/man/man3/mdc2.3
#usr/share/man/man3/pem.3
#usr/share/man/man3/rand.3
#usr/share/man/man3/rc4.3
#usr/share/man/man3/ripemd.3
#usr/share/man/man3/rsa.3

4
html/cgi-bin/samba.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPFire Team #
# Copyright (C) 2005-2012 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.9';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'share';
$sambasettings{'OSLEVEL'} = '33';

4
lfs/openssl
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.9.8u
VER = 0.9.8w
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = cb41e94f762ed63e41d1cca2b8430ede
$(DL_FILE)_MD5 = 4ceb7d570e42c094b360cc7b8e848a0b
install : $(TARGET)

8
lfs/samba
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# #
# 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 @@
include Config
VER = 3.5.14
VER = 3.5.15
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 39
PAK_VER = 40
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a97f5647face6e9214d5c42903412474
$(DL_FILE)_MD5 = 2d72c044bdfd854ee2ab736326da3afd
install : $(TARGET)