head 1.208; access; symbols pkgsrc-2014Q1:1.206.0.6 pkgsrc-2014Q1-base:1.206 pkgsrc-2013Q4:1.206.0.4 pkgsrc-2013Q4-base:1.206 pkgsrc-2013Q3:1.206.0.2 pkgsrc-2013Q3-base:1.206 pkgsrc-2013Q2:1.205.0.2 pkgsrc-2013Q2-base:1.205 pkgsrc-2013Q1:1.204.0.2 pkgsrc-2013Q1-base:1.204 pkgsrc-2012Q4:1.203.0.2 pkgsrc-2012Q4-base:1.203 pkgsrc-2012Q3:1.201.0.4 pkgsrc-2012Q3-base:1.201 pkgsrc-2012Q2:1.201.0.2 pkgsrc-2012Q2-base:1.201 pkgsrc-2012Q1:1.200.0.2 pkgsrc-2012Q1-base:1.200 pkgsrc-2011Q4:1.199.0.16 pkgsrc-2011Q4-base:1.199 pkgsrc-2011Q3:1.199.0.14 pkgsrc-2011Q3-base:1.199 pkgsrc-2011Q2:1.199.0.12 pkgsrc-2011Q2-base:1.199 pkgsrc-2011Q1:1.199.0.10 pkgsrc-2011Q1-base:1.199 pkgsrc-2010Q4:1.199.0.8 pkgsrc-2010Q4-base:1.199 pkgsrc-2010Q3:1.199.0.6 pkgsrc-2010Q3-base:1.199 pkgsrc-2010Q2:1.199.0.4 pkgsrc-2010Q2-base:1.199 pkgsrc-2010Q1:1.199.0.2 pkgsrc-2010Q1-base:1.199 pkgsrc-2009Q4:1.198.0.20 pkgsrc-2009Q4-base:1.198 pkgsrc-2009Q3:1.198.0.18 pkgsrc-2009Q3-base:1.198 pkgsrc-2009Q2:1.198.0.16 pkgsrc-2009Q2-base:1.198 pkgsrc-2009Q1:1.198.0.14 pkgsrc-2009Q1-base:1.198 pkgsrc-2008Q4:1.198.0.12 pkgsrc-2008Q4-base:1.198 pkgsrc-2008Q3:1.198.0.10 pkgsrc-2008Q3-base:1.198 cube-native-xorg:1.198.0.8 cube-native-xorg-base:1.198 pkgsrc-2008Q2:1.198.0.6 pkgsrc-2008Q2-base:1.198 cwrapper:1.198.0.4 pkgsrc-2008Q1:1.198.0.2 pkgsrc-2008Q1-base:1.198 pkgsrc-2007Q4:1.192.0.4 pkgsrc-2007Q4-base:1.192 pkgsrc-2007Q3:1.192.0.2 pkgsrc-2007Q3-base:1.192 pkgsrc-2007Q2:1.190.0.2 pkgsrc-2007Q2-base:1.190 pkgsrc-2007Q1:1.189.0.2 pkgsrc-2007Q1-base:1.189 pkgsrc-2006Q4:1.188.0.4 pkgsrc-2006Q4-base:1.188 pkgsrc-2006Q3:1.188.0.2 pkgsrc-2006Q3-base:1.188 pkgsrc-2006Q2:1.185.0.2 pkgsrc-2006Q2-base:1.185 pkgsrc-2006Q1:1.184.0.2 pkgsrc-2006Q1-base:1.184 pkgsrc-2005Q4:1.176.0.2 pkgsrc-2005Q4-base:1.176 pkgsrc-2005Q3:1.171.0.2 pkgsrc-2005Q3-base:1.171 pkgsrc-2005Q2:1.167.0.2 pkgsrc-2005Q2-base:1.167 pkgsrc-2005Q1:1.160.0.2 pkgsrc-2005Q1-base:1.160 pkgsrc-2004Q4:1.158.0.2 pkgsrc-2004Q4-base:1.158 pkgsrc-2004Q3:1.150.0.2 pkgsrc-2004Q3-base:1.150 pkgsrc-2004Q2:1.146.0.2 pkgsrc-2004Q2-base:1.146 pkgsrc-2004Q1:1.139.0.2 pkgsrc-2004Q1-base:1.139 pkgsrc-2003Q4:1.136.0.2 pkgsrc-2003Q4-base:1.136 netbsd-1-6-1:1.120.0.2 netbsd-1-6-1-base:1.120 netbsd-1-6:1.103.0.4 netbsd-1-6-RELEASE-base:1.103 pkgviews:1.101.0.2 pkgviews-base:1.101 buildlink2:1.92.0.2 buildlink2-base:1.103 netbsd-1-5-PATCH003:1.92 netbsd-1-5-PATCH001:1.68 netbsd-1-5-RELEASE:1.53 netbsd-1-4-PATCH003:1.53 netbsd-1-4-PATCH002:1.44 comdex-fall-1999:1.37 netbsd-1-4-PATCH001:1.35 netbsd-1-4-RELEASE:1.31 netbsd-1-3-PATCH003:1.19 netbsd-1-3-PATCH002:1.8; locks; strict; comment @# @; 1.208 date 2014.06.10.15.22.18; author joerg; state dead; branches; next 1.207; commitid djgMkPoOrhNxnZDx; 1.207 date 2014.05.29.23.37.56; author wiz; state Exp; branches; next 1.206; commitid laryHfkCalgYtuCx; 1.206 date 2013.07.12.10.45.03; author jperkin; state Exp; branches; next 1.205; commitid vVOw5ngQ2VNQxaXw; 1.205 date 2013.05.31.12.42.30; author wiz; state Exp; branches; next 1.204; commitid hIeXGcx6VfKHwMRw; 1.204 date 2013.03.02.17.52.33; author joerg; state Exp; branches; next 1.203; 1.203 date 2012.10.28.06.30.09; author asau; state Exp; branches; next 1.202; 1.202 date 2012.10.03.21.58.27; author wiz; state Exp; branches; next 1.201; 1.201 date 2012.05.29.20.23.12; author joerg; state Exp; branches; next 1.200; 1.200 date 2012.01.18.14.48.32; author adam; state Exp; branches; next 1.199; 1.199 date 2010.02.09.07.22.06; author dholland; state Exp; branches; next 1.198; 1.198 date 2008.02.23.05.26.01; author obache; state Exp; branches 1.198.20.1; next 1.197; 1.197 date 2008.02.23.05.16.33; author obache; state Exp; branches; next 1.196; 1.196 date 2008.02.17.20.15.07; author tnn; state Exp; branches; next 1.195; 1.195 date 2008.02.03.14.07.40; author tnn; state Exp; branches; next 1.194; 1.194 date 2008.02.03.13.24.22; author tnn; state Exp; branches; next 1.193; 1.193 date 2008.01.20.04.06.03; author reed; state Exp; branches; next 1.192; 1.192 date 2007.10.07.20.49.57; author dmcmahill; state Exp; branches; next 1.191; 1.191 date 2007.07.04.20.55.02; author jlam; state Exp; branches; next 1.190; 1.190 date 2007.06.28.00.38.00; author lkundrak; state Exp; branches; next 1.189; 1.189 date 2007.01.23.15.45.43; author ghen; state Exp; branches; next 1.188; 1.188 date 2006.07.30.11.17.51; author jdolecek; state Exp; branches; next 1.187; 1.187 date 2006.07.19.22.45.14; author wiz; state Exp; branches; next 1.186; 1.186 date 2006.07.02.10.43.18; author rillig; state Exp; branches; next 1.185; 1.185 date 2006.04.23.00.12.42; author jlam; state Exp; branches 1.185.2.1; next 1.184; 1.184 date 2006.03.04.21.30.57; author jlam; state Exp; branches; next 1.183; 1.183 date 2006.02.21.22.44.17; author wiz; state Exp; branches; next 1.182; 1.182 date 2006.02.05.23.11.18; author joerg; state Exp; branches; next 1.181; 1.181 date 2006.01.24.07.32.43; author wiz; state Exp; branches; next 1.180; 1.180 date 2006.01.09.00.51.03; author joerg; state Exp; branches; next 1.179; 1.179 date 2006.01.05.22.32.40; author joerg; state Exp; branches; next 1.178; 1.178 date 2006.01.05.10.01.20; author ghen; state Exp; branches; next 1.177; 1.177 date 2005.12.29.06.22.21; author jlam; state Exp; branches; next 1.176; 1.176 date 2005.12.15.12.57.29; author tron; state Exp; branches; next 1.175; 1.175 date 2005.12.05.23.55.22; author rillig; state Exp; branches; next 1.174; 1.174 date 2005.12.05.20.51.10; author rillig; state Exp; branches; next 1.173; 1.173 date 2005.10.19.20.30.20; author bouyer; state Exp; branches; next 1.172; 1.172 date 2005.10.05.13.29.50; author wiz; state Exp; branches; next 1.171; 1.171 date 2005.09.16.13.53.56; author salo; state Exp; branches 1.171.2.1; next 1.170; 1.170 date 2005.08.23.11.48.51; author rillig; state Exp; branches; next 1.169; 1.169 date 2005.08.20.19.16.22; author jlam; state Exp; branches; next 1.168; 1.168 date 2005.08.19.18.12.39; author jlam; state Exp; branches; next 1.167; 1.167 date 2005.05.31.20.00.43; author wiz; state Exp; branches; next 1.166; 1.166 date 2005.05.31.10.01.40; author dillo; state Exp; branches; next 1.165; 1.165 date 2005.05.17.19.11.47; author jlam; state Exp; branches; next 1.164; 1.164 date 2005.05.06.00.14.21; author wiz; state Exp; branches; next 1.163; 1.163 date 2005.05.03.22.17.17; author jlam; state Exp; branches; next 1.162; 1.162 date 2005.04.18.14.40.17; author wiz; state Exp; branches; next 1.161; 1.161 date 2005.04.11.21.47.51; author tv; state Exp; branches; next 1.160; 1.160 date 2005.02.28.23.30.48; author abs; state Exp; branches; next 1.159; 1.159 date 2004.12.28.02.47.50; author reed; state Exp; branches; next 1.158; 1.158 date 2004.11.26.18.52.47; author jlam; state Exp; branches; next 1.157; 1.157 date 2004.11.22.22.19.35; author wiz; state Exp; branches; next 1.156; 1.156 date 2004.11.15.15.05.34; author sketch; state Exp; branches; next 1.155; 1.155 date 2004.10.29.13.48.31; author abs; state Exp; branches; next 1.154; 1.154 date 2004.10.25.08.44.16; author tron; state Exp; branches; next 1.153; 1.153 date 2004.10.18.09.28.08; author tron; state Exp; branches; next 1.152; 1.152 date 2004.10.03.00.18.24; author tv; state Exp; branches; next 1.151; 1.151 date 2004.09.24.06.04.00; author tron; state Exp; branches; next 1.150; 1.150 date 2004.08.22.19.32.52; author jlam; state Exp; branches 1.150.2.1; next 1.149; 1.149 date 2004.08.02.19.54.17; author abs; state Exp; branches; next 1.148; 1.148 date 2004.07.30.21.05.42; author jlam; state Exp; branches; next 1.147; 1.147 date 2004.07.17.12.44.28; author tron; state Exp; branches; next 1.146; 1.146 date 2004.05.30.12.37.15; author tron; state Exp; branches 1.146.2.1; next 1.145; 1.145 date 2004.05.13.11.39.09; author taca; state Exp; branches; next 1.144; 1.144 date 2004.04.26.20.06.58; author jlam; state Exp; branches; next 1.143; 1.143 date 2004.04.25.06.21.11; author snj; state Exp; branches; next 1.142; 1.142 date 2004.04.24.22.46.12; author jlam; state Exp; branches; next 1.141; 1.141 date 2004.04.07.22.35.01; author tron; state Exp; branches; next 1.140; 1.140 date 2004.04.07.19.53.27; author reed; state Exp; branches; next 1.139; 1.139 date 2004.02.28.22.18.35; author snj; state Exp; branches 1.139.2.1; next 1.138; 1.138 date 2004.02.18.13.33.41; author jlam; state Exp; branches; next 1.137; 1.137 date 2004.02.09.19.57.55; author jlam; state Exp; branches; next 1.136; 1.136 date 2003.11.02.05.36.56; author grant; state Exp; branches; next 1.135; 1.135 date 2003.10.29.10.43.23; author cube; state Exp; branches; next 1.134; 1.134 date 2003.10.11.13.40.19; author grant; state Exp; branches; next 1.133; 1.133 date 2003.09.17.19.41.17; author grant; state Exp; branches; next 1.132; 1.132 date 2003.07.19.12.31.05; author tron; state Exp; branches; next 1.131; 1.131 date 2003.07.17.22.55.28; author grant; state Exp; branches; next 1.130; 1.130 date 2003.06.06.19.33.12; author drochner; state Exp; branches; next 1.129; 1.129 date 2003.05.31.15.03.17; author grant; state Exp; branches; next 1.128; 1.128 date 2003.05.31.13.32.49; author grant; state Exp; branches; next 1.127; 1.127 date 2003.05.31.13.30.30; author grant; state Exp; branches; next 1.126; 1.126 date 2003.05.31.13.29.20; author grant; state Exp; branches; next 1.125; 1.125 date 2003.04.15.01.39.15; author grant; state Exp; branches; next 1.124; 1.124 date 2003.04.10.19.31.52; author wiz; state Exp; branches; next 1.123; 1.123 date 2003.04.10.08.25.21; author wiz; state Exp; branches; next 1.122; 1.122 date 2003.03.14.19.38.00; author jlam; state Exp; branches; next 1.121; 1.121 date 2003.02.23.15.55.57; author jmmv; state Exp; branches; next 1.120; 1.120 date 2003.01.28.22.04.26; author jlam; state Exp; branches 1.120.2.1; next 1.119; 1.119 date 2003.01.27.11.10.27; author abs; state Exp; branches; next 1.118; 1.118 date 2003.01.20.22.58.26; author jschauma; state Exp; branches; next 1.117; 1.117 date 2002.12.22.13.04.39; author grant; state Exp; branches; next 1.116; 1.116 date 2002.12.19.14.08.34; author grant; state Exp; branches; next 1.115; 1.115 date 2002.11.18.10.40.12; author tron; state Exp; branches; next 1.114; 1.114 date 2002.11.18.10.36.35; author tron; state Exp; branches; next 1.113; 1.113 date 2002.11.18.08.19.37; author martti; state Exp; branches; next 1.112; 1.112 date 2002.11.15.10.40.26; author martti; state Exp; branches; next 1.111; 1.111 date 2002.11.15.09.08.06; author martti; state Exp; branches; next 1.110; 1.110 date 2002.10.25.09.00.29; author tron; state Exp; branches; next 1.109; 1.109 date 2002.10.10.00.52.43; author jlam; state Exp; branches; next 1.108; 1.108 date 2002.10.04.19.14.02; author tron; state Exp; branches; next 1.107; 1.107 date 2002.09.26.01.48.29; author grant; state Exp; branches; next 1.106; 1.106 date 2002.09.20.01.53.14; author jlam; state Exp; branches; next 1.105; 1.105 date 2002.09.19.09.04.28; author jlam; state Exp; branches; next 1.104; 1.104 date 2002.08.25.18.40.16; author jlam; state Exp; branches; next 1.103; 1.103 date 2002.08.01.00.58.33; author mycroft; state Exp; branches 1.103.4.1; next 1.102; 1.102 date 2002.07.30.18.40.14; author wiz; state Exp; branches; next 1.101; 1.101 date 2002.06.24.16.26.18; author taca; state Exp; branches; next 1.100; 1.100 date 2002.06.20.17.12.36; author taca; state Exp; branches; next 1.99; 1.99 date 2002.06.19.15.22.36; author tron; state Exp; branches; next 1.98; 1.98 date 2002.06.19.15.14.16; author fredb; state Exp; branches; next 1.97; 1.97 date 2002.06.19.14.07.51; author tron; state Exp; branches; next 1.96; 1.96 date 2002.06.19.11.03.59; author jdolecek; state Exp; branches; next 1.95; 1.95 date 2002.06.19.10.17.58; author jdolecek; state Exp; branches; next 1.94; 1.94 date 2002.06.18.02.06.01; author itojun; state Exp; branches; next 1.93; 1.93 date 2002.05.08.11.44.51; author kleink; state Exp; branches; next 1.92; 1.92 date 2002.04.02.14.13.01; author jlam; state Exp; branches 1.92.2.1; next 1.91; 1.91 date 2002.02.28.05.45.33; author jlam; state Exp; branches; next 1.90; 1.90 date 2002.02.05.05.35.11; author jmc; state Exp; branches; next 1.89; 1.89 date 2002.02.05.04.45.29; author jmc; state Exp; branches; next 1.88; 1.88 date 2002.02.01.16.04.39; author jlam; state Exp; branches; next 1.87; 1.87 date 2002.01.01.06.12.05; author jlam; state Exp; branches; next 1.86; 1.86 date 2001.12.26.21.20.27; author jlam; state Exp; branches; next 1.85; 1.85 date 2001.12.02.06.56.45; author jlam; state Exp; branches; next 1.84; 1.84 date 2001.11.25.18.59.48; author jlam; state Exp; branches; next 1.83; 1.83 date 2001.11.21.15.44.23; author jlam; state Exp; branches; next 1.82; 1.82 date 2001.11.19.16.23.12; author jlam; state Exp; branches; next 1.81; 1.81 date 2001.10.22.18.02.51; author jlam; state Exp; branches; next 1.80; 1.80 date 2001.10.20.17.46.50; author jlam; state Exp; branches; next 1.79; 1.79 date 2001.10.19.09.52.22; author veego; state Exp; branches; next 1.78; 1.78 date 2001.10.17.19.17.00; author jlam; state Exp; branches; next 1.77; 1.77 date 2001.10.16.04.11.06; author jlam; state Exp; branches; next 1.76; 1.76 date 2001.09.27.23.18.51; author jlam; state Exp; branches; next 1.75; 1.75 date 2001.07.13.07.09.24; author jlam; state Exp; branches; next 1.74; 1.74 date 2001.07.09.02.45.09; author hubertf; state Exp; branches; next 1.73; 1.73 date 2001.06.09.06.36.42; author jlam; state Exp; branches; next 1.72; 1.72 date 2001.05.18.06.01.35; author jlam; state Exp; branches; next 1.71; 1.71 date 2001.05.18.02.19.07; author jlam; state Exp; branches; next 1.70; 1.70 date 2001.05.17.16.32.26; author abs; state Exp; branches; next 1.69; 1.69 date 2001.05.14.14.02.02; author jlam; state Exp; branches; next 1.68; 1.68 date 2001.05.08.17.28.09; author jlam; state Exp; branches; next 1.67; 1.67 date 2001.04.29.21.21.13; author jlam; state Exp; branches; next 1.66; 1.66 date 2001.04.29.20.42.28; author jlam; state Exp; branches; next 1.65; 1.65 date 2001.04.14.19.50.04; author kim; state Exp; branches; next 1.64; 1.64 date 2001.04.14.19.42.53; author kim; state Exp; branches; next 1.63; 1.63 date 2001.03.13.20.52.26; author jlam; state Exp; branches; next 1.62; 1.62 date 2001.02.17.17.21.54; author wiz; state Exp; branches; next 1.61; 1.61 date 2001.02.13.11.38.23; author kei; state Exp; branches; next 1.60; 1.60 date 2001.02.07.09.56.45; author tron; state Exp; branches; next 1.59; 1.59 date 2001.02.07.09.52.45; author tron; state Exp; branches; next 1.58; 1.58 date 2001.02.06.12.38.59; author itojun; state Exp; branches; next 1.57; 1.57 date 2001.02.02.16.39.56; author jlam; state Exp; branches; next 1.56; 1.56 date 2001.01.13.15.25.04; author tv; state Exp; branches; next 1.55; 1.55 date 2000.12.22.19.41.52; author jlam; state Exp; branches; next 1.54; 1.54 date 2000.12.11.00.03.08; author jlam; state Exp; branches; next 1.53; 1.53 date 2000.10.17.18.14.15; author jlam; state Exp; branches; next 1.52; 1.52 date 2000.10.13.21.46.45; author jlam; state Exp; branches; next 1.51; 1.51 date 2000.09.20.05.14.12; author jlam; state Exp; branches; next 1.50; 1.50 date 2000.09.12.19.39.02; author thorpej; state Exp; branches; next 1.49; 1.49 date 2000.09.12.14.17.31; author jlam; state Exp; branches; next 1.48; 1.48 date 2000.09.06.06.17.55; author jlam; state Exp; branches; next 1.47; 1.47 date 2000.08.28.09.14.52; author jlam; state Exp; branches; next 1.46; 1.46 date 2000.04.24.13.13.22; author tron; state Exp; branches; next 1.45; 1.45 date 2000.04.05.21.05.30; author cjs; state Exp; branches; next 1.44; 1.44 date 2000.02.22.17.38.16; author veego; state Exp; branches; next 1.43; 1.43 date 2000.02.20.22.05.42; author wiz; state Exp; branches; next 1.42; 1.42 date 2000.02.05.14.01.11; author wiz; state Exp; branches; next 1.41; 1.41 date 2000.01.31.16.35.36; author christos; state Exp; branches; next 1.40; 1.40 date 99.12.01.00.41.34; author bad; state Exp; branches; next 1.39; 1.39 date 99.11.30.20.33.33; author tron; state Exp; branches; next 1.38; 1.38 date 99.11.21.22.09.26; author tron; state Exp; branches; next 1.37; 1.37 date 99.08.18.08.29.10; author agc; state Exp; branches; next 1.36; 1.36 date 99.07.23.18.20.04; author itojun; state Exp; branches; next 1.35; 1.35 date 99.06.05.20.32.17; author tron; state Exp; branches; next 1.34; 1.34 date 99.05.11.20.26.23; author tron; state Exp; branches; next 1.33; 1.33 date 99.05.11.18.32.23; author tron; state Exp; branches; next 1.32; 1.32 date 99.05.11.16.04.03; author tron; state Exp; branches; next 1.31; 1.31 date 99.04.30.23.51.39; author tv; state Exp; branches; next 1.30; 1.30 date 99.04.30.17.05.19; author tv; state Exp; branches; next 1.29; 1.29 date 99.02.20.22.48.44; author hubertf; state Exp; branches; next 1.28; 1.28 date 98.12.07.16.20.39; author tv; state Exp; branches; next 1.27; 1.27 date 98.12.04.17.23.19; author tv; state Exp; branches; next 1.26; 1.26 date 98.12.03.22.26.52; author tv; state Exp; branches; next 1.25; 1.25 date 98.12.03.17.23.52; author tv; state Exp; branches; next 1.24; 1.24 date 98.11.12.23.54.33; author frueauf; state Exp; branches; next 1.23; 1.23 date 98.10.05.14.26.01; author tv; state Exp; branches; next 1.22; 1.22 date 98.10.03.22.00.22; author tv; state Exp; branches; next 1.21; 1.21 date 98.10.03.21.01.14; author tv; state Exp; branches; next 1.20; 1.20 date 98.10.02.14.40.13; author tv; state Exp; branches; next 1.19; 1.19 date 98.09.17.18.18.54; author cjs; state Exp; branches; next 1.18; 1.18 date 98.09.05.23.14.45; author hubertf; state Exp; branches; next 1.17; 1.17 date 98.09.05.22.27.29; author hubertf; state Exp; branches; next 1.16; 1.16 date 98.08.20.15.17.30; author tsarna; state Exp; branches; next 1.15; 1.15 date 98.08.07.23.46.09; author cjs; state Exp; branches; next 1.14; 1.14 date 98.07.21.21.34.09; author cjs; state Exp; branches; next 1.13; 1.13 date 98.06.22.13.14.31; author agc; state Exp; branches; next 1.12; 1.12 date 98.06.06.23.48.20; author tv; state Exp; branches; next 1.11; 1.11 date 98.06.05.11.09.23; author frueauf; state Exp; branches; next 1.10; 1.10 date 98.06.04.19.38.36; author tv; state Exp; branches; next 1.9; 1.9 date 98.06.03.14.01.11; author agc; state Exp; branches; next 1.8; 1.8 date 98.05.09.15.24.45; author frueauf; state Exp; branches; next 1.7; 1.7 date 98.04.20.11.56.34; author frueauf; state Exp; branches; next 1.6; 1.6 date 98.04.15.10.38.51; author agc; state Exp; branches; next 1.5; 1.5 date 98.03.24.20.34.57; author cjs; state Exp; branches; next 1.4; 1.4 date 98.03.18.19.16.27; author cjs; state Exp; branches; next 1.3; 1.3 date 98.03.06.13.08.54; author frueauf; state Exp; branches; next 1.2; 1.2 date 98.03.05.11.42.42; author cjs; state Exp; branches; next 1.1; 1.1 date 98.03.05.08.02.22; author cjs; state Exp; branches; next ; 1.198.20.1 date 2010.02.10.20.37.33; author spz; state Exp; branches; next ; 1.185.2.1 date 2006.07.30.19.21.26; author salo; state Exp; branches; next 1.185.2.2; 1.185.2.2 date 2006.07.30.19.29.43; author salo; state Exp; branches; next ; 1.171.2.1 date 2005.10.19.22.04.48; author salo; state Exp; branches; next 1.171.2.2; 1.171.2.2 date 2005.12.15.13.36.32; author salo; state Exp; branches; next ; 1.150.2.1 date 2004.09.30.13.58.22; author agc; state Exp; branches; next 1.150.2.2; 1.150.2.2 date 2004.12.01.00.25.56; author salo; state Exp; branches; next ; 1.146.2.1 date 2004.07.20.21.56.58; author agc; state Exp; branches; next ; 1.139.2.1 date 2004.04.27.08.14.40; author agc; state Exp; branches; next 1.139.2.2; 1.139.2.2 date 2004.05.26.10.50.49; author grant; state Exp; branches; next 1.139.2.3; 1.139.2.3 date 2004.05.31.10.37.26; author grant; state Exp; branches; next ; 1.120.2.1 date 2003.08.05.11.43.38; author grant; state Exp; branches; next ; 1.103.4.1 date 2002.10.11.21.09.04; author agc; state Exp; branches; next ; 1.92.2.1 date 2002.06.23.19.03.25; author jlam; state Exp; branches; next 1.92.2.2; 1.92.2.2 date 2002.07.01.17.45.14; author jlam; state Exp; branches; next 1.92.2.3; 1.92.2.3 date 2002.08.22.11.12.54; author jlam; state Exp; branches; next ; desc @@ 1.208 log @Retire Apache 1.3 and 2.0. @ text @# $NetBSD: Makefile,v 1.207 2014/05/29 23:37:56 wiz Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). DISTNAME= apache_1.3.42 PKGNAME= ${DISTNAME:S/_/-/} PKGREVISION= 7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST} MAINTAINER= pkgsrc-users@@NetBSD.org HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server NETBSD_LOGO= sitedrivenby.gif SITES.${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ MODSSL_VERSION= 2.8.31 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.41 MODSSL_DIST= ${MODSSL_DISTNAME}.tar.gz MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} SITES.${MODSSL_DIST}= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/ CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif} # Actually, apache is only written in C, but we need this so that # a dlopen()ed apache module that's written in C++ will have static # objects constructed properly. USE_LANGUAGES= c c++ HAS_CONFIGURE= YES CONFIGURE_ARGS+= --with-layout="${WRKSRC}/config.layout:pkgsrc" CONFIGURE_ARGS+= --enable-module=most \ --enable-module=auth_db \ --disable-module=auth_dbm CONFIGURE_ARGS+= --enable-rule=EAPI \ --disable-module=ssl CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --without-confadjust CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM=${APACHE_CUSTOM_CFLAGS:Q} CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}" CONFIGURE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} INSTALL_MAKE_FLAGS+= root=${DESTDIR:Q} .include "../../mk/bsd.prefs.mk" .if empty(STRIPFLAG) CONFIGURE_ARGS+= --without-execstrip .endif PKG_SYSCONFSUBDIR?= httpd USE_TOOLS+= perl APACHE_USER?= www APACHE_GROUP?= www PKG_USERS_VARS+= APACHE_USER PKG_GROUPS_VARS+= APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER:Q} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP:Q} PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= perf-tuning suexec .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuexec) APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin APACHE_SUEXEC_CONFIGURE_ARGS+= \ --suexec-caller=${APACHE_USER} \ --suexec-safepath=${APACHE_SUEXEC_PATH:Q} \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} CONFIGURE_ARGS+= --enable-suexec \ ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*} PLIST_SRC= ${PKGDIR}/PLIST.suexec BUILD_DEFS+= APACHE_SUEXEC_DOCROOT .endif # Note that there is NO static compile module hook here. This is intentional. # Under Apache 1.3, modules can be compiled to link dynamically to the server # using the "apxs" program. See apxs(8). # .if !defined(NOPIC) CONFIGURE_ARGS+= --enable-module=so # requires dlopen() _ENABLE_MOD= --enable-shared PLIST_SRC+= ${PKGDIR}/PLIST.shared .else _ENABLE_MOD= --enable-module .endif PLIST_SRC+= ${PKGDIR}/PLIST CONFIGURE_ARGS+= ${_ENABLE_MOD}=proxy CONFIGURE_ARGS+= ${_ENABLE_MOD}=define # from mod_ssl pkg.addon APACHE_CUSTOM_CFLAGS?= # empty .if !empty(PKG_OPTIONS:Mperf-tuning) APACHE_CUSTOM_CFLAGS+= -DBUFFERED_LOGS APACHE_CUSTOM_CFLAGS+= ${COMPILER_PERFTUNE_FLAGS} LDFLAGS+= ${COMPILER_PERFTUNE_FLAGS} .endif # Explicitly turn on large file support APACHE_CUSTOM_CFLAGS+= -D_LARGEFILE_SOURCE APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 .include "../../mk/compiler.mk" # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. # .if ${OPSYS} == "NetBSD" . if ${OBJECT_FMT} == "ELF" LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK} MAKE_ENV+= LINK_LIBGCC_LDFLAGS=${LINK_LIBGCC_LDFLAGS:Q} # # If we are using gcc3, we need to link against libgcc_s, too. This # ensures modules can resolve symbols they require from gcc. # . if !empty(CC_VERSION:Mgcc-3*) LINK_LIBGCC_LDFLAGS+= -lgcc_s . endif . endif .endif BUILD_DEFS+= APACHE_CUSTOM_CFLAGS APACHE_USER APACHE_GROUP EGDIR= ${PREFIX}/share/examples/httpd CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf CONF_FILES+= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic CONF_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types RCD_SCRIPTS= apache REQD_DIRS= ${PREFIX}/share/httpd REQD_DIRS+= ${PREFIX}/share/httpd/htdocs REQD_DIRS+= ${PREFIX}/lib/httpd OWN_DIRS+= ${VARBASE}/httpd OWN_DIRS+= ${VARBASE}/log/httpd OWN_DIRS_PERMS+= ${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # # Fix paths in the apache manpages. # SUBST_CLASSES+= man SUBST_STAGE.man= post-patch SUBST_FILES.man= src/support/*.1 src/support/*.8 SUBST_SED.man= -e 's,/usr/local/apache/conf,${PKG_SYSCONFDIR},' SUBST_SED.man+= -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},' SUBST_SED.man+= -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},' SUBST_SED.man+= -e 's,/usr/local/apache/logs,${VARBASE}/log/httpd,' SUBST_SED.man+= -e 's,/usr/local/apache,${PREFIX}/share/httpd/htdocs,' SUBST_SED.man+= -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,' SUBST_CLASSES+= paths SUBST_FILES.paths= config.layout SUBST_SED.paths+= -e 's,@@PREFIX@@,${PREFIX},g' SUBST_SED.paths+= -e 's,@@PKG_SYSCONFDIR@@,${PKG_SYSCONFDIR},g' SUBST_SED.paths+= -e 's,@@VARBASE@@,${VARBASE},g' SUBST_STAGE.paths= post-patch .include "../../mk/bdb.buildlink3.mk" SUBST_CLASSES+= db SUBST_STAGE.db= post-patch SUBST_FILES.db= src/modules/standard/mod_auth_db.module SUBST_SED.db+= -e 's,@@DB_LIB@@,${BDB_LIBS},g' SUBST_SED.db+= -e 's,@@DB_VERSION@@,${BDB_TYPE},g' .if defined(BDB_BASE) && !empty(BDB_BASE) SUBST_SED.db+= -e 's,@@DB_CFLAGS@@,-I${BDB_BASE}/include,g' .else SUBST_SED.db+= -e 's,@@DB_CFLAGS@@,,g' .endif REPLACE_PERL+= cgi-bin/printenv CHECK_INTERPRETER_SKIP+= lib/httpd/httpd.exp PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q} MAKE_ENV+= FIND=${FIND:Q} CHGRP=${CHGRP:Q} .include "../../devel/libmm/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" post-extract: ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include ${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra ${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod ${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap ${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include ${CP} ${FILESDIR}/config.layout ${WRKSRC} pre-patch: cd ${WRKSRC} && ${CAT} \ ${MODSSL_SRC}/pkg.addon/addon.patch \ ${MODSSL_SRC}/pkg.eapi/eapi.patch \ ${MODSSL_SRC}/pkg.sslcfg/sslcfg.patch \ ${MODSSL_SRC}/pkg.sslmod/sslmod.patch \ ${MODSSL_SRC}/pkg.sslsup/sslsup.patch \ | ${PATCH} ${PATCH_ARGS} cd ${WRKSRC} && ${TAIL} -n +160 \ ${MODSSL_SRC}/pkg.ssldoc/ssldoc.patch \ | ${PATCH} ${PATCH_ARGS} ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f post-patch: cd ${WRKSRC}/src/support; \ ${SED} -e "s|@@INSTALL@@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \ apxs.pl > apxs.pl.sed; \ ${MV} apxs.pl.sed apxs.pl pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f post-install: .if !defined(NOPIC) cd ${DESTDIR}${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so .endif ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/httpd for file in httpd.conf magic mime.types; do \ ${INSTALL_DATA} ${DESTDIR}${PKG_SYSCONFDIR}/$${file}.default \ ${DESTDIR}${PREFIX}/share/examples/httpd; \ ${RM} -f ${DESTDIR}${PKG_SYSCONFDIR}/$${file}.default; \ done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${DESTDIR}${PREFIX}/share/httpd/htdocs ${CHMOD} ${NONBINMODE} ${DESTDIR}${PREFIX}/libexec/cgi-bin/printenv \ ${DESTDIR}${PREFIX}/libexec/cgi-bin/test-cgi .include "../../mk/bsd.pkg.mk" @ 1.207 log @Bump for perl-5.20.0. Do it for all packages that * mention perl, or * have a directory name starting with p5-*, or * depend on a package starting with p5- like last time, for 5.18, where this didn't lead to complaints. Let me know if you have any this time. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.206 2013/07/12 10:45:03 jperkin Exp $ @ 1.206 log @Bump PKGREVISION of all packages which create users, to pick up change of sysutils/user_* packages. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.205 2013/05/31 12:42:30 wiz Exp $ d8 1 a8 1 PKGREVISION= 6 @ 1.205 log @Bump all packages for perl-5.18, that a) refer 'perl' in their Makefile, or b) have a directory name of p5-*, or c) have any dependency on any p5-* package Like last time, where this caused no complaints. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.204 2013/03/02 17:52:33 joerg Exp $ d8 1 a8 1 PKGREVISION= 5 @ 1.204 log @Don't strip -Wl flag on the apxs command line. Bump revision. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.203 2012/10/28 06:30:09 asau Exp $ d8 1 a8 1 PKGREVISION= 4 @ 1.203 log @Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.202 2012/10/03 21:58:27 wiz Exp $ d8 1 a8 1 PKGREVISION= 3 @ 1.202 log @Bump all packages that use perl, or depend on a p5-* package, or are called p5-*. I hope that's all of them. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.201 2012/05/29 20:23:12 joerg Exp $ a17 2 PKG_DESTDIR_SUPPORT= user-destdir @ 1.201 log @Link with CC like other platforms. Fixes module build with Clang. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.200 2012/01/18 14:48:32 adam Exp $ d8 1 a8 1 PKGREVISION= 2 @ 1.200 log @Revbump after db5 update @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.199 2010/02/09 07:22:06 dholland Exp $ d8 1 a8 1 PKGREVISION= 1 @ 1.199 log @Update to 1.3.42, fixing CVE-2010-0010. Note: this package is now EOL upstream. The next security bug probably won't get patched, so if you're still using this, it's time to migrate to 2.x. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.198 2008/02/23 05:26:01 obache Exp $ d8 1 @ 1.198 log @Add DESTDIR support. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.197 2008/02/23 05:16:33 obache Exp $ d6 1 a6 1 DISTNAME= apache_1.3.41 @ 1.198.20.1 log @Pullup ticket 2996 - requested by dholland security update Revisions pulled up: - pkgsrc/www/apache/Makefile 1.199 - pkgsrc/www/apache/distinfo 1.60 - pkgsrc/www/ap-ssl/Makefile 1.109 - pkgsrc/www/ap-ssl/distinfo 1.35 Files added: pkgsrc/www/ap-ssl/patches/patch-ac ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: dholland Date: Tue Feb 9 07:22:06 UTC 2010 Modified Files: pkgsrc/www/apache: Makefile distinfo Log Message: Update to 1.3.42, fixing CVE-2010-0010. Note: this package is now EOL upstream. The next security bug probably won't get patched, so if you're still using this, it's time to migrate to 2.x. To generate a diff of this commit: cvs rdiff -u -r1.198 -r1.199 pkgsrc/www/apache/Makefile cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/apache/distinfo ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: dholland Date: Wed Feb 10 03:55:18 UTC 2010 Modified Files: pkgsrc/www/ap-ssl: Makefile distinfo Added Files: pkgsrc/www/ap-ssl/patches: patch-ac Log Message: Hack this to build against Apache 1.3.42. As 1.3.42 doesn't change anything significant in the internals, all this requires is patching the accepted version and bumping BUILDLINK_API_DEPENDS. PKGREVISION++. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/www/ap-ssl/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/ap-ssl/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/www/ap-ssl/patches/patch-ac @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.199 2010/02/09 07:22:06 dholland Exp $ d6 1 a6 1 DISTNAME= apache_1.3.42 @ 1.197 log @Update apache to 1.3.41. Changes with Apache 1.3.41 *) SECURITY: CVE-2007-6388 (cve.mitre.org) mod_status: Ensure refresh parameter is numeric to prevent a possible XSS attack caused by redirecting to other URLs. Reported by SecurityReason. [Mark Cox] Changes with Apache 1.3.40 (not released) *) SECURITY: CVE-2007-5000 (cve.mitre.org) mod_imap: Fix cross-site scripting issue. Reported by JPCERT. [Joe Orton] *) SECURITY: CVE-2007-3847 (cve.mitre.org) mod_proxy: Prevent reading past the end of a buffer when parsing date-related headers. PR 41144. With Apache 1.3, the denial of service vulnerability applies only to the Windows and NetWare platforms. [Jeff Trawick] *) More efficient implementation of the CVE-2007-3304 PID table patch. This fixes issues with excessive memory usage by the parent process if long-running and with a high number of child process forks during that timeframe. Also fixes bogus "Bad pid" errors. [Jim Jagielski, Jeff Trawick] Changes with Apache 1.3.39 *) SECURITY: CVE-2006-5752 (cve.mitre.org) mod_status: Fix a possible XSS attack against a site with a public server-status page and ExtendedStatus enabled, for browsers which perform charset "detection". Reported by Stefan Esser. [Joe Orton] *) SECURITY: CVE-2007-3304 (cve.mitre.org) Ensure that the parent process cannot be forced to kill non-child processes by checking scoreboard PID data with parent process privately stored PID data. [Jim Jagielski] *) mime.types: Many updates to sync with IANA registry and common unregistered types that the owners refuse to register. Admins are encouraged to update their installed mime.types file. pr: 35550, 37798, 39317, 31483 [Roy T. Fielding] There was no Apache 1.3.38 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.196 2008/02/17 20:15:07 tnn Exp $ d17 2 d51 1 d229 1 a229 1 cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so d231 1 a231 1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd d233 3 a235 3 ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \ ${PREFIX}/share/examples/httpd; \ ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \ d237 3 a239 3 ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${CHMOD} ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/printenv \ ${PREFIX}/libexec/cgi-bin/test-cgi @ 1.196 log @Fix use of obsolete tail(1) syntax which coreutils 6.10 doesn't grok. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.195 2008/02/03 14:07:40 tnn Exp $ d6 1 a6 1 DISTNAME= apache_1.3.37 a7 1 PKGREVISION= 2 d20 2 a21 2 MODSSL_VERSION= 2.8.28 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.37 @ 1.195 log @Fix check interpreter warnings. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.194 2008/02/03 13:24:22 tnn Exp $ d211 1 a211 1 cd ${WRKSRC} && ${TAIL} +160 \ @ 1.194 log @Honour PKGMANDIR. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.193 2008/01/20 04:06:03 reed Exp $ d182 2 a183 1 REPLACE_PERL= docs/cgi-examples/printenv @ 1.193 log @Change a BUILD_DEFS and add some more. (As discussed in September 2007 on tech-pkg.) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.192 2007/10/07 20:49:57 dmcmahill Exp $ d43 1 @ 1.192 log @Be sure we actually use the db stuff as set up by bdb.buildlink3.mk. This fixes a long standing build failure on SunOS-5.9/sparc and does not seem to break things on NetBSD. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.191 2007/07/04 20:55:02 jlam Exp $ d82 1 a82 1 BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS d133 1 a133 1 BUILD_DEFS+= APACHE_CUSTOM_CFLAGS @ 1.191 log @Make it easier to build and install packages "unprivileged", where the owner of all installed files is a non-root user. This change affects most packages that require special users or groups by making them use the specified unprivileged user and group instead. (1) Add two new variables PKG_GROUPS_VARS and PKG_USERS_VARS to unprivileged.mk. These two variables are lists of other bmake variables that define package-specific users and groups. Packages that have user-settable variables for users and groups, e.g. apache and APACHE_{USER,GROUP}, courier-mta and COURIER_{USER,GROUP}, etc., should list these variables in PKG_USERS_VARS and PKG_GROUPS_VARS so that unprivileged.mk can know to set them to ${UNPRIVILEGED_USER} and ${UNPRIVILEGED_GROUP}. (2) Modify packages to use PKG_GROUPS_VARS and PKG_USERS_VARS. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.190 2007/06/28 00:38:00 lkundrak Exp $ d169 12 a190 1 .include "../../mk/bdb.buildlink3.mk" @ 1.190 log @Fixing two possible security vulnerabilities: CVE-2006-5752 XSS in mod_status with ExtendedStatus on CVE-2007-3304 Remote DoS if MPM and mod_cache enabled bumping PKGREVISION @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.189 2007/01/23 15:45:43 ghen Exp $ d61 2 a62 1 BUILD_DEFS+= APACHE_USER APACHE_GROUP @ 1.189 log @Fix perl interpreter path for libexec/cgi-bin/printenv. Bump PKGREVISION for apache, apache2 and apache22. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.188 2006/07/30 11:17:51 jdolecek Exp $ d8 1 a8 1 PKGREVISION= 1 @ 1.188 log @Update to 1.3.37: Changes with Apache 1.3.37 *) SECURITY: CVE-2006-3747 (cve.mitre.org) mod_rewrite: Fix an off-by-one security problem in the ldap scheme handling. For some RewriteRules this could lead to a pointer being written out of bounds. Reported by Mark Dowd of McAfee. [Mark Cox] @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.187 2006/07/19 22:45:14 wiz Exp $ d8 1 d168 2 @ 1.187 log @Update to 1.3.36: Changes with Apache 1.3.36 *) Reverted SVN rev #396294 due to unwanted regression. The new feature introduced in 1.3.35 (Allow usage of the "Include" configuration directive within previously "Include"d files) has been removed in the meantime. (http://svn.apache.org/viewcvs?rev=396294&view=rev) Changes with Apache 1.3.35 *) SECURITY: CVE-2005-3352 (cve.mitre.org) mod_imap: Escape untrusted referer header before outputting in HTML to avoid potential cross-site scripting. Change also made to ap_escape_html so we escape quotes. Reported by JPCERT. [Mark Cox] *) core: Allow usage of the "Include" configuration directive within previously "Include"d files. [Colm MacCarthaigh] *) HTML-escape the Expect error message. Not classed as security as an attacker has no way to influence the Expect header a victim will send to a target site. Reported by Thiago Zaninotti [Mark Cox] *) mod_cgi: Remove block on OPTIONS method so that scripts can respond to OPTIONS directly rather than via server default. [Roy Fielding] PR 15242 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.186 2006/07/02 10:43:18 rillig Exp $ d6 1 a6 1 DISTNAME= apache_1.3.36 d20 2 a21 2 MODSSL_VERSION= 2.8.27 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.36 @ 1.186 log @Fixed some easy pkglint warnings. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.185 2006/04/23 00:12:42 jlam Exp $ d6 1 a6 1 DISTNAME= apache_1.3.34 a7 1 PKGREVISION= 6 d20 2 a21 2 MODSSL_VERSION= 2.8.25 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.34 @ 1.185 log @Modify packages that set PKG_USERS and PKG_GROUPS to follow the new syntax as specified in pkgsrc/mk/install/bsd.pkginstall.mk:1.47. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.184 2006/03/04 21:30:57 jlam Exp $ d19 1 a19 1 SITES_${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ d25 1 a25 1 SITES_${MODSSL_DIST}= http://www.modssl.org/source/ \ d76 1 a76 1 --suexec-safepath='${APACHE_SUEXEC_PATH}' \ d151 1 a151 1 SUBST_CLASSES+= man paths d161 1 d180 6 a185 6 @@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include @@${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra @@${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod @@${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap @@${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include @@${CP} ${FILESDIR}/config.layout ${WRKSRC} d188 1 a188 1 @@cd ${WRKSRC} && ${CAT} \ d195 1 a195 1 @@cd ${WRKSRC} && ${TAIL} +160 \ d198 1 a198 1 @@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f d201 1 a201 1 @@cd ${WRKSRC}/src/support; \ d207 1 a207 1 @@${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f @ 1.185.2.1 log @Pullup ticket 1761 - requested by wiz security update for apache Revisions pulled up: - pkgsrc/www/apache/Makefile 1.186, 1.187 - pkgsrc/www/apache/buildlink3.mk 1.16 - pkgsrc/www/apache/distinfo 1.52 - pkgsrc/www/apache/module.mk 1.11 - pkgsrc/www/apache/patches/patch-ap removed Module Name: pkgsrc Committed By: rillig Date: Sun Jul 2 10:43:19 UTC 2006 Modified Files: pkgsrc/www/apache: Makefile buildlink3.mk module.mk Log Message: Fixed some easy pkglint warnings. --- Module Name: pkgsrc Committed By: wiz Date: Wed Jul 19 22:45:14 UTC 2006 Modified Files: pkgsrc/www/apache: Makefile distinfo Removed Files: pkgsrc/www/apache/patches: patch-ap Log Message: Update to 1.3.36: Changes with Apache 1.3.36 *) Reverted SVN rev #396294 due to unwanted regression. The new feature introduced in 1.3.35 (Allow usage of the "Include" configuration directive within previously "Include"d files) has been removed in the meantime. (http://svn.apache.org/viewcvs?rev=396294&viewàev) Changes with Apache 1.3.35 *) SECURITY: CVE-2005-3352 (cve.mitre.org) mod_imap: Escape untrusted referer header before outputting in HTML to avoid potential cross-site scripting. Change also made to ap_escape_html so we escape quotes. Reported by JPCERT. [Mark Cox] *) core: Allow usage of the "Include" configuration directive within previously "Include"d files. [Colm MacCarthaigh] *) HTML-escape the Expect error message. Not classed as security as an attacker has no way to influence the Expect header a victim will send to a target site. Reported by Thiago Zaninotti [Mark Cox] *) mod_cgi: Remove block on OPTIONS method so that scripts can respond to OPTIONS directly rather than via server default. [Roy Fielding] PR 15242 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.187 2006/07/19 22:45:14 wiz Exp $ d6 1 a6 1 DISTNAME= apache_1.3.36 d8 1 d19 1 a19 1 SITES.${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ d21 2 a22 2 MODSSL_VERSION= 2.8.27 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.36 d25 1 a25 1 SITES.${MODSSL_DIST}= http://www.modssl.org/source/ \ d76 1 a76 1 --suexec-safepath=${APACHE_SUEXEC_PATH:Q} \ d151 1 a151 1 SUBST_CLASSES+= man a160 1 SUBST_CLASSES+= paths d179 6 a184 6 ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include ${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra ${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod ${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap ${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include ${CP} ${FILESDIR}/config.layout ${WRKSRC} d187 1 a187 1 cd ${WRKSRC} && ${CAT} \ d194 1 a194 1 cd ${WRKSRC} && ${TAIL} +160 \ d197 1 a197 1 ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f d200 1 a200 1 cd ${WRKSRC}/src/support; \ d206 1 a206 1 ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f @ 1.185.2.2 log @Pullup ticket 1763 - requested by wiz security update for apache Revisions pulled up: - pkgsrc/www/apache/Makefile 1.188 - pkgsrc/www/apache/distinfo 1.53 - pkgsrc/www/ap-ssl/Makefile 1.103 - pkgsrc/www/ap-ssl/distinfo 1.33 Module Name: pkgsrc Committed By: jdolecek Date: Sun Jul 30 11:17:51 UTC 2006 Modified Files: pkgsrc/www/apache: Makefile distinfo Log Message: Update to 1.3.37: Changes with Apache 1.3.37 *) SECURITY: CVE-2006-3747 (cve.mitre.org) mod_rewrite: Fix an off-by-one security problem in the ldap scheme handling. For some RewriteRules this could lead to a pointer being written out of bounds. Reported by Mark Dowd of McAfee. [Mark Cox] --- Module Name: pkgsrc Committed By: jdolecek Date: Sun Jul 30 11:19:38 UTC 2006 Modified Files: pkgsrc/www/ap-ssl: Makefile distinfo Log Message: Update to 2.8.28, for apache-1.3.37 No changes besides the apache version update. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.188 2006/07/30 11:17:51 jdolecek Exp $ d6 1 a6 1 DISTNAME= apache_1.3.37 d20 2 a21 2 MODSSL_VERSION= 2.8.28 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.37 @ 1.184 log @Point MAINTAINER to pkgsrc-users@@NetBSD.org in the case where no developer is officially maintaining the package. The rationale for changing this from "tech-pkg" to "pkgsrc-users" is that it implies that any user can try to maintain the package (by submitting patches to the mailing list). Since the folks most likely to care about the package are the folks that want to use it or are already using it, this would leverage the energy of users who aren't developers. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.183 2006/02/21 22:44:17 wiz Exp $ d168 1 a168 1 PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user @ 1.183 log @Fix config file handling; fix CHECK_PLIST build. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.182 2006/02/05 23:11:18 joerg Exp $ d14 1 a14 1 MAINTAINER= tech-pkg@@NetBSD.org @ 1.182 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.181 2006/01/24 07:32:43 wiz Exp $ d8 1 a8 1 PKGREVISION= 5 d143 1 a143 1 OWN_DIRS+= ${PREFIX}/lib/httpd @ 1.181 log @Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because of the shlib major bump. PKGREVISION++ for the dependencies. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.180 2006/01/09 00:51:03 joerg Exp $ d8 1 a8 1 PKGREVISION= 4 @ 1.180 log @Fix httpd linkage on DragonFly: -Wl,-E is needed, otherwise ap-php can't use ap_block_alarms. Bump revision. Problem noticed by Justin Sherrill on DragonFly's bugs list. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.179 2006/01/05 22:32:40 joerg Exp $ d8 1 a8 1 PKGREVISION= 3 @ 1.179 log @Use SUBST framework instead of manual sedding. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.178 2006/01/05 10:01:20 ghen Exp $ d8 1 a8 1 PKGREVISION= 2 @ 1.178 log @Fix the default config and ServerRoot paths in apache and apache2 manpages, as suggested by PR pkg/32300, bump PKGREVISION. Ok by tron, wiz. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.177 2005/12/29 06:22:21 jlam Exp $ d37 1 a37 1 CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc" d151 1 a151 1 SUBST_CLASSES+= man d161 6 d184 1 a204 4 pre-configure: @@${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/config.layout > ${WRKDIR}/config.layout @ 1.177 log @Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk automatically detects whether we want the pkginstall machinery to be used by the package Makefile. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.176 2005/12/15 12:57:29 tron Exp $ d8 1 a8 1 PKGREVISION= 1 d148 13 @ 1.176 log @Add fix for security vulnerability reported in CVE-2005-3352 taken from Apache SVN repository. Bump package revision because of that. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.175 2005/12/05 23:55:22 rillig Exp $ a35 1 USE_PKGINSTALL= YES @ 1.175 log @Ran "pkglint --autofix", which corrected some of the quoting issues in CONFIGURE_ARGS. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.174 2005/12/05 20:51:10 rillig Exp $ d8 1 @ 1.174 log @Fixed pkglint warnings. The warnings are mostly quoting issues, for example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.173 2005/10/19 20:30:20 bouyer Exp $ d44 1 a44 1 CONFIGURE_ARGS+= --with-perl=${PERL5} d63 2 a64 2 CONFIGURE_ARGS+= --server-uid=${APACHE_USER} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} @ 1.173 log @Update to 1.3.34. This is a security fix release, fix pkg/31868 by Zafer Aydogan. Changes from 1.3.33: *) hsregex: fix potential core dumping on 64 bit machines, such as AMD64. PR 31858. [Glenn Strauss < gs-apache-dev gluelogic.com>] *) SECURITY: core: If a request contains both Transfer-Encoding and Content-Length headers, remove the Content-Length, mitigating some HTTP Request Splitting/Spoofing attacks. This has no impact on mod_proxy_http, yet affects any module which supports chunked encoding yet fails to prefer T-E: chunked over the Content-Length purported value. [Paul Querna, Joe Orton] *) Added TraceEnable [on|off|extended] per-server directive to alter the behavior of the TRACE method. This addresses a flaw in proxy conformance to RFC 2616 - previously the proxy server would accept a TRACE request body although the RFC prohibited it. The default remains 'TraceEnable on'. [William Rowe] *) mod_digest: Fix another nonce string calculation issue. [Eric Covener] @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.172 2005/10/05 13:29:50 wiz Exp $ d46 1 a46 1 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" d48 1 a48 1 CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} d121 1 a121 1 MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" d151 2 a152 2 MAKE_ENV+= CHMOD="${CHMOD}" CHOWN="${CHOWN}" XARGS="${XARGS}" MAKE_ENV+= FIND="${FIND}" CHGRP="${CHGRP}" @ 1.172 log @Remove some more *LEGACY* settings that are over a month old and thus were before 2005Q3. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.171 2005/09/16 13:53:56 salo Exp $ d6 1 a6 1 DISTNAME= apache_1.3.33 a7 1 PKGREVISION= 7 d20 2 a21 2 MODSSL_VERSION= 2.8.24 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.33 @ 1.171 log @Update ap-ssl to version 2.8.24. - Fix a security issue (CAN-2005-2700) where "SSLVerifyClient require" was not enforced in per-location context if "SSLVerifyClient optional" was configured in the global virtual host configuration. Sync apache with the latest ap-ssl. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.170 2005/08/23 11:48:51 rillig Exp $ a68 2 PKG_OPTIONS_LEGACY_VARS+= APACHE_PERF_TUNING:perf-tuning PKG_OPTIONS_LEGACY_VARS+= APACHE_SUEXEC:suexec @ 1.171.2.1 log @Pullup ticket 842 - requested by Manuel Bouyer security update for apache Revisions pulled up: - pkgsrc/www/apache/Makefile 1.173 - pkgsrc/www/apache/distinfo 1.47 - pkgsrc/www/apache/PLIST 1.14 - pkgsrc/www/ap-ssl/Makefile 1.92 - pkgsrc/www/ap-ssl/distinfo 1.30 Module Name: pkgsrc Committed By: bouyer Date: Wed Oct 19 20:30:21 UTC 2005 Modified Files: pkgsrc/www/apache: Makefile distinfo Log Message: Update to 1.3.34. This is a security fix release, fix pkg/31868 by Zafer Aydogan. Changes from 1.3.33: *) hsregex: fix potential core dumping on 64 bit machines, such as AMD64. bug 31858. [Glenn Strauss < gs-apache-dev gluelogic.com>] *) SECURITY: core: If a request contains both Transfer-Encoding and Content-Length headers, remove the Content-Length, mitigating some HTTP Request Splitting/Spoofing attacks. This has no impact on mod_proxy_http, yet affects any module which supports chunked encoding yet fails to prefer T-E: chunked over the Content-Length purported value. [Paul Querna, Joe Orton] *) Added TraceEnable [on|off|extended] per-server directive to alter the behavior of the TRACE method. This addresses a flaw in proxy conformance to RFC 2616 - previously the proxy server would accept a TRACE request body although the RFC prohibited it. The default remains 'TraceEnable on'. [William Rowe] *) mod_digest: Fix another nonce string calculation issue. [Eric Covener] --- Module Name: pkgsrc Committed By: bouyer Date: Wed Oct 19 20:33:44 UTC 2005 Modified Files: pkgsrc/www/ap-ssl: Makefile distinfo Log Message: Update to mod_ssl 2.8.25. The only change is support for apache 1.3.34. --- Module Name: pkgsrc Committed By: bouyer Date: Wed Oct 19 21:42:59 UTC 2005 Modified Files: pkgsrc/www/apache: PLIST Log Message: Add missing entry for a new file. Pointed out by Lubomir Sedlacik. Close enouth to the package update to not bump pkgrevision. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.173 2005/10/19 20:30:20 bouyer Exp $ d6 1 a6 1 DISTNAME= apache_1.3.34 d8 1 d21 2 a22 2 MODSSL_VERSION= 2.8.25 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.34 @ 1.171.2.2 log @Pullup ticket 960 - requested by Matthias Scheler security fix for apache Revisions pulled up: - pkgsrc/www/apache/Makefile 1.176 - pkgsrc/www/apache/distinfo 1.48 - pkgsrc/www/apache/patches/patch-ap 1.7 Module Name: pkgsrc Committed By: tron Date: Thu Dec 15 12:57:30 UTC 2005 Modified Files: pkgsrc/www/apache: Makefile distinfo Added Files: pkgsrc/www/apache/patches: patch-ap Log Message: Add fix for security vulnerability reported in CVE-2005-3352 taken from Apache SVN repository. Bump package revision because of that. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.176 2005/12/15 12:57:29 tron Exp $ a7 1 PKGREVISION= 1 @ 1.170 log @The real user name in PKG_USERS does not need to be escaped with double backslashes anymore. A single backslash is enough. Changed the definition in all affected packages. For those that are not caught, an additional check is placed into bsd.pkginstall.mk. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.169 2005/08/20 19:16:22 jlam Exp $ d8 1 a8 1 PKGREVISION= 6 d21 2 a22 2 MODSSL_VERSION= 2.8.21 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.32 @ 1.169 log @Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so that these directories will be conditionally removed (based on reference counts), regardless of the value of PKG_CONFIG. Bump the PKGREVISION for packages that were modified as a result. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.168 2005/08/19 18:12:39 jlam Exp $ d152 1 a152 1 PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user @ 1.168 log @Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS as the INSTALL and DEINSTALL scripts no longer distinguish between the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the packages in pkgsrc accordingly. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.167 2005/05/31 20:00:43 wiz Exp $ d8 1 a8 1 PKGREVISION= 5 d144 2 a145 2 MAKE_DIRS= ${PREFIX}/share/httpd MAKE_DIRS+= ${PREFIX}/share/httpd/htdocs @ 1.167 log @Remove some obsolete variables from BUILD_DEFS. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.166 2005/05/31 10:01:40 dillo Exp $ d140 2 a141 2 SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types @ 1.166 log @Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also, make use of PKG_OPTIONS_LEGACY_VARS. Reviewed by wiz. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.165 2005/05/17 19:11:47 jlam Exp $ a135 2 BUILD_DEFS+= APACHE_PERF_TUNING BUILD_DEFS+= APACHE_SUEXEC @ 1.165 log @apxs needs perl. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.164 2005/05/06 00:14:21 wiz Exp $ a66 7 .if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= perf-tuning .endif .if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) PKG_DEFAULT_OPTIONS+= suexec .endif d69 3 @ 1.164 log @Revert: Remove an instance of ${TYPE} from pkgsrc. The use of the private variable _INSTALL_CMD is only temporary until we switch over to the new tools framework. The committed version has an additional | (pipe) character in it, breaking the sed and causing an empty apxs file. Replacing the pipes with commas does not help either, because then the backquoted command gets embedded into apxs instead of the correct pathname. Bump PKGREVISION because this broke at least ap-php and ap-ssl. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.163 2005/05/03 22:17:17 jlam Exp $ d58 1 @ 1.163 log @Remove an instance of ${TYPE} from pkgsrc. The use of the private variable _INSTALL_CMD is only temporary until we switch over to the new tools framework. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.162 2005/04/18 14:40:17 wiz Exp $ d8 1 a8 1 PKGREVISION= 4 d189 1 a189 1 ${SED} -e "s|@@INSTALL@@|"${_INSTALL_CMD:Q}" -c -o ${LIBOWN} -g ${LIBGRP}|" \ @ 1.162 log @Remove custom "restart" code from startup script so that Apache really gets restarted when "/etc/rc.d/apache restart" is used. This fixes PR pkg/24179 for the "apache" package. Based on a similar change for the apache2 package. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.161 2005/04/11 21:47:51 tv Exp $ d189 1 a189 1 ${SED} -e "s|@@INSTALL@@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \ @ 1.161 log @Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.160 2005/02/28 23:30:48 abs Exp $ d8 1 a8 1 PKGREVISION= 3 @ 1.160 log @Update apache to apache_1-3.33nb3: Previously rc.d/apache was updated to run stop & start for restart. '/etc/rc.d/apache restart' then picked up startssl if apache was not running, but if apache was running it has a large chance of the start running before the stop completes, leaving no httpd running. Instead, add a restartssl option to apachectl, and use it. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.159 2004/12/28 02:47:50 reed Exp $ a31 1 USE_BUILDLINK3= YES @ 1.159 log @The default location of the pkgsrc-installed rc.d scripts is now under share/examples/rc.d. The variable name already was named RCD_SCRIPTS_EXAMPLEDIR. This is from ideas from Greg Woods and others. Also bumped PKGREVISION for all packages using RCD_SCRIPTS mechanism (as requested by wiz). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.158 2004/11/26 18:52:47 jlam Exp $ d8 1 a8 1 PKGREVISION= 2 @ 1.158 log @Pass the DL_* flags to the compiler when building httpd so that dlopen will work correctly on NetBSD-2.x. This should fix PR pkg/29398. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.157 2004/11/22 22:19:35 wiz Exp $ d8 1 a8 1 PKGREVISION= 1 @ 1.157 log @Replace USE_GCC_SHLIB with USE_LANGUAGES=c c++ and a nice big comment why we add c++ to the variable. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.156 2004/11/15 15:05:34 sketch Exp $ d8 1 d166 1 @ 1.156 log @Use ${VARBASE} instead of hardcoded /var. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.155 2004/10/29 13:48:31 abs Exp $ d32 4 a132 1 USE_GCC_SHLIB= YES @ 1.155 log @Update apache to 1.3.33 The main security vulnerabilities addressed in 1.3.33 are: * CAN-2004-0940 (cve.mitre.org) Fix potential buffer overflow with escaped characters in SSI tag string. * CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. New features * Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. * Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. The following bugs were found in Apache 1.3.31 (or earlier) and have been fixed in Apache 1.3.33: * mod_rewrite: Fix query string handling for proxied URLs. PR 14518. * mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. * mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. * Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. * No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.154 2004/10/25 08:44:16 tron Exp $ d149 3 a151 3 OWN_DIRS+= /var/httpd OWN_DIRS+= /var/log/httpd OWN_DIRS_PERMS+= /var/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 @ 1.154 log @Update "apache" package to version 1.3.32. Changes since version 1.3.31: - mod_rewrite: Fix query string handling for proxied URLs. PR 14518. [michael teitler , Jan Kratochvil ] - mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. [André Malo] - mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. [Joe Orton] - Trigger an error when a LoadModule directive attempts to load a module which is built-in. This is a common error when switching from a DSO build to a static build. [Jeff Trawick, Geoffrey Young] - Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. [Will Slater ] - Fix memory leak in the cache handling of mod_rewrite. PR 27862. [chunyan sheng , André Malo] - mod_rewrite no longer confuses the RewriteMap caches if different maps defined in different virtual hosts use the same map name. PR 26462. [André Malo] - mod_setenvif: Remove "support" for Remote_User variable which never worked at all. PR 25725. [André Malo] - mod_usertrack: Escape the cookie name before pasting into the regexp. [André Malo] - Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. [Jeff Trawick] - SECURITY: CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. [Mark Cox] - Fix a bunch of cases where the return code of the regex compiler was not checked properly. This affects mod_usertrack and core. PR 28218. [André Malo] - No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. [Jim Jagielski, Rasmus Lerdorf] - COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. [Jim Jagielski] @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.153 2004/10/18 09:28:08 tron Exp $ d6 1 a6 1 DISTNAME= apache_1.3.32 @ 1.153 log @Use "mod_ssl-2.8.20" sources for SSL hooks, bump package revision. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.152 2004/10/03 00:18:24 tv Exp $ d6 1 a6 1 DISTNAME= apache_1.3.31 a7 1 PKGREVISION= 7 d20 2 a21 2 MODSSL_VERSION= 2.8.20 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.31 @ 1.152 log @Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10 in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.151 2004/09/24 06:04:00 tron Exp $ d8 1 a8 1 PKGREVISION= 6 d21 1 a21 1 MODSSL_VERSION= 2.8.19 @ 1.151 log @Apply fix for security vulnerability in proxy module reported in CAN-2004-0492. Bump package revision package of this. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.150 2004/08/22 19:32:52 jlam Exp $ d8 1 a8 1 PKGREVISION= 5 @ 1.150 log @Change the way that legacy USE_* and FOO_USE_* options are converted into the bsd.options.mk framework. Instead of appending to ${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes the default options to be the union of PKG_DEFAULT_OPTIONS and any old USE_* and FOO_USE_* settings. This fixes PR pkg/26590. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.149 2004/08/02 19:54:17 abs Exp $ d8 1 a8 1 PKGREVISION= 4 @ 1.150.2.1 log @Pullup ticket 114, requested by Matthias Scheler. Security fix for apache Modified Files: pkgsrc/www/apache: Makefile distinfo Added Files: pkgsrc/www/apache/patches: patch-ap Log Message: Apply fix for security vulnerability in proxy module reported in CAN-2004-0492. Bump package revision package of this. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.150 2004/08/22 19:32:52 jlam Exp $ d8 1 a8 1 PKGREVISION= 5 @ 1.150.2.2 log @Pullup ticket 141 - requested by David Brownlee security fix for apache Module Name: pkgsrc Committed By: tron Date: Mon Oct 25 08:44:16 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile PLIST distinfo Removed Files: pkgsrc/www/apache/patches: patch-ap Log Message: Update "apache" package to version 1.3.32. Changes since version 1.3.31: - mod_rewrite: Fix query string handling for proxied URLs. PR 14518. [michael teitler , Jan Kratochvil ] - mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. [André Malo] - mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. [Joe Orton] - Trigger an error when a LoadModule directive attempts to load a module which is built-in. This is a common error when switching from a DSO build to a static build. [Jeff Trawick, Geoffrey Young] - Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. [Will Slater ] - Fix memory leak in the cache handling of mod_rewrite. PR 27862. [chunyan sheng , André Malo] - mod_rewrite no longer confuses the RewriteMap caches if different maps defined in different virtual hosts use the same map name. PR 26462. [André Malo] - mod_setenvif: Remove "support" for Remote_User variable which never worked at all. PR 25725. [André Malo] - mod_usertrack: Escape the cookie name before pasting into the regexp. [André Malo] - Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. [Jeff Trawick] - SECURITY: CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. [Mark Cox] - Fix a bunch of cases where the return code of the regex compiler was not checked properly. This affects mod_usertrack and core. PR 28218. [André Malo] - No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. [Jim Jagielski, Rasmus Lerdorf] - COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. [Jim Jagielski] --- Module Name: pkgsrc Committed By: abs Date: Fri Oct 29 13:48:31 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile distinfo pkgsrc/www/apache/patches: patch-aa patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak patch-am patch-ao Removed Files: pkgsrc/www/apache/patches: patch-al Log Message: Update apache to 1.3.33 The main security vulnerabilities addressed in 1.3.33 are: * CAN-2004-0940 (cve.mitre.org) Fix potential buffer overflow with escaped characters in SSI tag string. * CAN-2004-0492 (cve.mitre.org) Reject responses from a remote server if sent an invalid (negative) Content-Length. New features * Win32: Improve error reporting after a failed attempt to spawn a piped log process or rewrite map process. * Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT. It controls how UseCanonicalName Off determines the port value if the client doesn't provide one in the Host header. If defined during compilation, UseCanonicalName Off will use the physical port number to generate the canonical name. If not defined, it tries the current Port value followed by the default port for the current scheme. The following bugs were found in Apache 1.3.31 (or earlier) and have been fixed in Apache 1.3.33: * mod_rewrite: Fix query string handling for proxied URLs. PR 14518. * mod_rewrite: Fix 0 bytes write into random memory position. PR 31036. * mod_digest: Fix nonce string calculation since 1.3.31 which would force re-authentication for every connection if AuthDigestRealmSeed was not configured. PR 30920. * Fix trivial bug in mod_log_forensic that caused the child to seg fault when certain invalid requests were fired at it with forensic logging is enabled. PR 29313. * No longer breaks mod_dav, frontpage and others. Repair a patch in 1.3.31 which prevented discarding the request body for requests that will be keptalive but are not currently keptalive. PR 29237. --- Module Name: pkgsrc Committed By: salo Date: Mon Nov 15 19:13:41 UTC 2004 Modified Files: pkgsrc/www/apache/patches: patch-ai Log Message: Revert rev 1.9, do not expand @@INSTALL@@, it's done in post-patch. (hi abs!) --- Module Name: pkgsrc Committed By: tron Date: Tue Nov 16 08:23:45 UTC 2004 Modified Files: pkgsrc/www/apache: distinfo Log Message: Regen after "patch-ai" was changed. (hi salo!) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.155 2004/10/29 13:48:31 abs Exp $ d6 1 a6 1 DISTNAME= apache_1.3.33 d8 1 d21 2 a22 2 MODSSL_VERSION= 2.8.21 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.32 @ 1.149 log @Update apache to 1.3.31nb4: Fix rc.d/apache restart to 'apache_doit stop; apache_doit start' Now in the case of apache_start=startssl and apache not running, 'rc.d/apache restart' will start apache with startssl. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.148 2004/07/30 21:05:42 jlam Exp $ d63 5 a67 10 # Global and legacy options .if defined(APACHE_PERF_TUNING) || defined(APACHE_SUEXEC) . if !defined(PKG_OPTIONS.apache) . if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) PKG_OPTIONS.apache+= perf-tuning . endif . if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) PKG_OPTIONS.apache+= suexec . endif . endif @ 1.148 log @Convert to use bsd.options.mk. The relevant options variable to set for each package can be determined by invoking: make show-var VARNAME=PKG_OPTIONS_VAR The old options are still supported unless the variable named in PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.147 2004/07/17 12:44:28 tron Exp $ d8 1 a8 1 PKGREVISION= 2 @ 1.147 log @Use "mod_ssl-2.8.19" sources for SSL hooks, bump package revision. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.146 2004/05/30 12:37:15 tron Exp $ d63 17 a79 1 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES d110 1 a110 1 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == "YES" @ 1.146 log @Compile with version 2.8.18 of "mod_ssl" instead with the (reported to be vulnerable) version 2.8.17. Bump package revision because of this. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.145 2004/05/13 11:39:09 taca Exp $ d8 1 a8 1 PKGREVISION= 1 d21 1 a21 1 MODSSL_VERSION= 2.8.18 @ 1.146.2.1 log @Pull up ticket 62 to the pkgsrc-2004Q2 branch, requested by Grant Beattie. Security fix for ap-ssl and apache: Module Name: pkgsrc Committed By: tron Date: Sat Jul 17 12:44:28 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile distinfo Log Message: Use "mod_ssl-2.8.19" sources for SSL hooks, bump package revision. and Module Name: pkgsrc Committed By: tron Date: Sat Jul 17 12:43:37 UTC 2004 Modified Files: pkgsrc/www/ap-ssl: Makefile distinfo Log Message: Update "ap-ssl" package to version 2.8.19: - Fix ssl_log() related format string vulnerability in mod_proxy hook functions. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.146 2004/05/30 12:37:15 tron Exp $ d8 1 a8 1 PKGREVISION= 2 d21 1 a21 1 MODSSL_VERSION= 2.8.19 @ 1.145 log @Update apache package to 1.3.31. Apache 1.3.31 Major changes Security vulnerabilities * CAN-2003-0987 (cve.mitre.org) In mod_digest, verify whether the nonce returned in the client response is one we issued ourselves. This problem does not affect mod_auth_digest. * CAN-2003-0020 (cve.mitre.org) Escape arbitrary data before writing into the errorlog. * CAN-2004-0174 (cve.mitre.org) Fix starvation issue on listening sockets where a short-lived connection on a rarely-accessed listening socket will cause a child to hold the accept mutex and block out new connections until another connection arrives on that rarely-accessed listening socket. * CAN-2003-0993 (cve.mitre.org) Fix parsing of Allow/Deny rules using IP addresses without a netmask; issue is only known to affect big-endian 64-bit platforms New features New features that relate to specific platforms: * Linux 2.4+: If Apache is started as root and you code CoreDumpDirectory, core dumps are enabled via the prctl() syscall. New features that relate to all platforms: * Add mod_whatkilledus and mod_backtrace (experimental) for reporting diagnostic information after a child process crash. * Add fatal exception hook for running diagnostic code after a crash. * Forensic logging module added (mod_log_forensic) * '%X' is now accepted as an alias for '%c' in the LogFormat directive. This allows you to configure logging to still log the connection status even with mod_ssl Bugs fixed The following noteworthy bugs were found in Apache 1.3.29 (or earlier) and have been fixed in Apache 1.3.31: * Fix memory corruption problem with ap_custom_response() function. The core per-dir config would later point to request pool data that would be reused for different purposes on different requests. * mod_usertrack no longer inspects the Cookie2 header for the cookie name. It also no longer overwrites other cookies. * Fix bug causing core dump when using CookieTracking without specifying a CookieName directly. * UseCanonicalName off was ignoring the client provided port information. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.144 2004/04/26 20:06:58 jlam Exp $ d6 3 a8 3 DISTNAME= apache_${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} APACHE_VERSION= 1.3.31 d21 1 a21 1 MODSSL_VERSION= 2.8.17 @ 1.144 log @Convert to use bdb.buildlink3.mk and fix sources so that we can use db4. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.143 2004/04/25 06:21:11 snj Exp $ d8 1 a8 2 PKGREVISION= 2 APACHE_VERSION= 1.3.29 d21 2 a22 2 MODSSL_VERSION= 2.8.16 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.29 @ 1.143 log @Convert to buildlink3. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.142 2004/04/24 22:46:12 jlam Exp $ d115 2 a116 1 # if we are using gcc3, we need to link against libgcc_s, too. This d118 1 d120 1 a120 1 USE_GCC_SHLIB= YES # defined a125 18 # Use operating system's db1 functions (where available) USE_DB185= # defined .include "../../databases/db/buildlink3.mk" BUILDLINK_DEPENDS.db= db>=2.7.7 .if defined(BUILDLINK_PREFIX.db_DEFAULT) CONFIGURE_ENV+= INCLUDES="${BUILDLINK_CPPFLAGS.db}" # on Solaris, we also need libdbm . if ${OPSYS} == "SunOS" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" LDFLAGS+= -Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib . else CONFIGURE_ENV+= LIBS="-ldb2" . endif .endif d150 4 a200 3 .include "../../devel/libmm/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" @ 1.142 log @Relinquish maintainership of packages to tech-pkg@@NetBSD.org. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.141 2004/04/07 22:35:01 tron Exp $ d33 1 a33 1 USE_BUILDLINK2= YES d127 1 a127 1 .include "../../databases/db/buildlink2.mk" d213 2 a214 2 .include "../../devel/libmm/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" @ 1.141 log @Fix patch checksums and bump package revision again because the security patches weren't applied before. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.140 2004/04/07 19:53:27 reed Exp $ d15 1 a15 1 MAINTAINER= jlam@@NetBSD.org @ 1.140 log @Add three patches to resolve security issue: SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the errorlog The three patches are from Apache cvs. http://cvs.apache.org/viewcvs.cgi/apache-1.3/src/ Also bump PKGREVISION too. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.139 2004/02/28 22:18:35 snj Exp $ d8 1 a8 1 PKGREVISION= 1 @ 1.139 log @Forgot to commit this part. MAKE_ENV needs CHGRP="${CHGRP}". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.138 2004/02/18 13:33:41 jlam Exp $ d8 1 @ 1.139.2.1 log @Pull up security fix to the pkgsrc-2004Q1 branch. Requested by taca in ticket pkgsrc-16 (and 12, I think). "Add three patches to resolve security issue: SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the errorlog The three patches are from Apache cvs. http://cvs.apache.org/viewcvs.cgi/apache-1.3/src/ Also bump PKGREVISION too." @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.140 2004/04/07 19:53:27 reed Exp $ a7 1 PKGREVISION= 1 @ 1.139.2.2 log @Apply patch (requested by taca in ticket #31): Update apache package to 1.3.31. * CAN-2003-0987 (cve.mitre.org) * CAN-2003-0020 (cve.mitre.org) * CAN-2004-0174 (cve.mitre.org) * CAN-2003-0993 (cve.mitre.org) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.141 2004/04/07 22:35:01 tron Exp $ d8 2 a9 1 APACHE_VERSION= 1.3.31 d22 2 a23 2 MODSSL_VERSION= 2.8.17 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.31 @ 1.139.2.3 log @Pull up revision 1.146 (requested by taca in ticket #33): Compile with version 2.8.18 of "mod_ssl" instead with the (reported to be vulnerable) version 2.8.17. Bump package revision because of this. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.146 2004/05/30 12:37:15 tron Exp $ d6 3 a8 3 DISTNAME= apache_1.3.31 PKGNAME= ${DISTNAME:S/_/-/} PKGREVISION= 1 d21 1 a21 1 MODSSL_VERSION= 2.8.18 @ 1.138 log @Include "../../mk/compiler.mk" to get the value of CC_VERSION before testing it. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.137 2004/02/09 19:57:55 jlam Exp $ d163 1 a163 1 MAKE_ENV+= FIND="${FIND}" @ 1.137 log @USE_GCC[23], USE_SUNPRO, and USE_MIPSPRO are all deprecated. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.136 2003/11/02 05:36:56 grant Exp $ d104 2 @ 1.136 log @Updated apache to 1.3.29. Major changes since 1.3.28: Security vulnerabilities * CAN-2003-0542 (cve.mitre.org) Fix buffer overflows in mod_alias and mod_rewrite which occurred if one configured a regular expression with more than 9 captures. Bugs fixed The following noteworthy bugs were found in Apache 1.3.28 (or earlier) and have been fixed in Apache 1.3.29: * Within ap_bclose(), ap_pclosesocket() is now called * consistently for sockets and ap_pclosef() for files. Also, closesocket() is used consistenly to close socket fd's. The previous confusion between socket and file fd's would cause problems with some applications now that we proactively close fd's to prevent leakage. * Fixed mod_usertrack to not get false positive matches on the user-tracking cookie's name. * Prevent creation of subprocess Zombies when using CGI wrappers such as suEXEC and cgiwrap. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.135 2003/10/29 10:43:23 cube Exp $ d114 1 a114 1 . if defined(USE_GCC3) @ 1.135 log @Import security fix from 1.3.29 distribution for a buffer overflow in mod_rewrite and mod_alias, referenced CAN-2003-0542. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.134 2003/10/11 13:40:19 grant Exp $ d8 1 a8 2 APACHE_VERSION= 1.3.28 PKGREVISION= 2 d21 2 a22 2 MODSSL_VERSION= 2.8.15 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-${APACHE_VERSION} @ 1.134 log @bump PKGREVISIONs after bump of expat BUILDLINK_DEPENDS. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.133 2003/09/17 19:41:17 grant Exp $ d9 1 a9 1 PKGREVISION= 1 @ 1.133 log @get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.132 2003/07/19 12:31:05 tron Exp $ d9 1 @ 1.132 log @Update "apache" package to version 1.3.28. Changes since version 1.3.27: - SECURITY: CAN-2003-0460 (cve.mitre.org) Fix the rotatelogs support program on Win32 and OS/2 to ignore special control characters received over the pipe. Previously such characters could cause it to quit logging and exit. [André Malo] - Prevent the server from crashing when entering infinite loops. The new LimitInternalRecursion directive configures limits of subsequent internal redirects and nested subrequests, after which the request will be aborted. PR 19753 (and probably others). [William Rowe, Jeff Trawick, Jim Jagielski, André Malo] - Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP response. PR 21085. [Glenn Nielsen , André Malo] - Removed BIND_NOSTART from HP/UX shl_load() logic for loadable Apache modules, so that statics are initialized when the module is loaded (especially critical for c++ modules on HPUX.) [William Rowe, Noah Arliss ] - Win32 build system changes; always recompile buildmark.c (used for Apache -v 'server built' messages) even when Apache is built from within the IDE; build test_char.h and uri_delims.h from within the ApacheCore.dsp project. PR 12706. [William Rowe] - Introduce Win32 .pdb diagnostic symbols into the Apache 1.3 build (as created in Apache 2.0.45 and later.) Makes debugging and analysis of crash dumps and Dr. Watson logs trivial. Requires the Win32 binary builder to set aside the exact .pdb files that match the released binaries (.exe/.so files) for reference by users and developers. [William Rowe] - Make sure the accept mutex is released before calling child exit hooks and cleanups. Otherwise, modules can segfault in such code and, with pthread mutexes, leave the server deadlocked. Even if the module doesn't segfault, if it performs extensive processing it can temporarily prevent the server from accepting new connections. [Jeff Trawick] - Fix mod_rewrite's handling of absolute URIs. The escaping routines now work scheme dependent and the query string will only be appended if supported by the particular scheme. [André Malo] - Use appropriate language codes for Czech (cs) and Traditional Chinese (zh-tw) in default config files. PR 9427. [André Malo] - Don't block synchronous signals (e.g., SIGSEGV) while waiting for and holding a pthread accept mutex. [Jeff Trawick] - AIX: Change the default accept mechanism from pthread back to fcntl. Idle child cleanup doesn't work when the child selected for termination by the parent is waiting on a pthread mutex, and because the AIX kernel's notion of hot process is apparently the same as Apache's, it is common for the Apache parent to continually select a child for termination that the kernel will leave waiting on the mutex for extended periods of time. There are other concerns with pthread mutexes as well, such as the ability to deadlock the server if a child process segfaults while holding the mutex. [Jeff Trawick] - Fix a pair of potential buffer overflows in htdigest [Martin Schulze , Thom May] - A newly created child now has a start_time of 0, to prevent mod_status from displaying a bogus value for the "time to process most recent request" column for freshly-started children in a previously-used scoreboard slot. [Martin Kraemer] - When using Redirect in directory context, append requested query string if there's no one supplied by configuration. PR 10961. [André Malo] - Fix path handling of mod_rewrite, especially on non-unix systems. There was some confusion between local paths and URL paths. PR 12902. [André Malo] - backport from 2.x series: Prevent endless loops of internal redirects in mod_rewrite by aborting after exceeding a limit of internal redirects. The limit defaults to 10 and can be changed using the RewriteOptions directive. PR 17462. [André Malo] - Use the correct locations of srm.conf and access.conf when tailoring the httpd.conf during the install process. PR 9446. [Stanislav Brabec ] - suexec: Be more pedantic when cleaning environment. Clean it immediately after startup. PR 2790, 10449. [Jeff Stewart , André Malo] - Fix apxs to insert LoadModule/AddModule directives only outside of sections. PR 8712, 9012. [André Malo] - Fix suexec compile error under SUNOS4, where strerror() doesn't exist. PR 5913, 9977. [Jonathan W Miner ] - Unix build: Add support for environment variable EXTRA_LDFLAGS_SHLIB, which allows the user to add to the hard-coded ld flags specified for DSOs. Compare with the existing LDFLAGS_SHLIB environment variable, which allows the user to completely replace the hard-coded ld flags specified for DSOs. [Jeff Trawick] - mod_auth_digest no longer tries to guess AuthDigestDomain, if it's not specified. Now it assumes "/" as already documented. PR 16937. [André Malo] - In configure always assume suexec-umask to be an octal value by prepending a "0". PR 16984. [André Malo] - Fix typo in suexec -V output. PR 9034. [Youichirou Koga ] - Fix bug where 'Satisfy Any' without an AuthType resulted in an "Internal Server Error" response. PR 9076. [André Malo] - mod_rewrite: Allow "RewriteEngine Off" even if no "Options FollowSymlinks" (or SymlinksIfOwnermatch) is set. PR 12395. [André Malo] - Change the log messages for setsockopt(TCP_NODELAY) and getsockname() failures to log the client IP address and to change the log level to debug. [Jeff Trawick] - Correction to mod_negotation for Win32, OS2, Netware etc, where case insensitive requests such as the HEADER or README search from autoindex would fail to match HEADER.html (because the system internally looked for the case-sensitive header.* pattern.) PR 7300 [William Rowe] - Correction to mod_autoindex so that only text/* files (prefering /html, then /plain, then some other flavor) can be recovered from a multiview-based HEADER or README subrequest. [William Rowe] - Improvements to mod_usertrack that allows for a regular (verbose) as well as "compact" version of the tracking cookie (the new 'CookieFormat' directive), and the ability to prepend a string to the cookie via the 'CookiePrefix' directive. [Pål Løberg , with cleanup by Jim Jagielski] - Certain 3rd party modules would bypass the Apache API and not invoke ap_cleanup_for_exec() before creating sub-processes. To such a child process, Apache's file descriptors (lock fd's, log files, sockets) were accessible, allowing them direct access to Apache log file etc. Where the OS allows, we now add proactive close functions to prevent these file descriptors from leaking to the child processes. [Jim Jagielski, Martin Kraemer] - Prevent obscenely large values of precision in ap_vformatter from clobbering a buffer. [Sander Striker, Jim Jagielski] - NetWare: implemented ap_os_default_port() to resolve the correct default port based on the request method. This fixes a URL reconstruction problem on a redirect. [Pavel Novy (novy@@feld.cvut.cz)] - Added new ap_register_cleanup_ex() API function which allows for a "magic" cleanup function to be run at register time rather than at cleanup time. Also added the ap_note_cleanups_for_(socket|fd|file)_ex() API functions which allows for control over whether that magic cleanup should be called or not. This does not change the default behavior of the non-"ex" function (eg: ap_register_cleanup). [Jim Jagielski, concept by Ben Laurie] - PORT: Take advantage of OpenBSD's arc4random() function for the initial secret [Henning Brauer ] - If Listen directive is not a port, but just an IP, emit an error condition as this case is ambiguous. [Rich Bowen, Justin Erenkrantz, Cliff Woolley] - Update timeout algorithm in free_proc_chain. If a subprocess did not exit immediately, the thread would sleep for 3 seconds before checking the subprocess exit status again. In a very common case when the subprocess was an HTTP server CGI script, the CGI script actually exited a fraction of a second into the 3 second sleep, which effectively limited the server to serving one CGI request every 3 seconds across a persistent connection. PRs 6961, 8664 [Bill Stoddard] - mod_setenvif: Add SERVER_ADDR special keyword to allow envariable setting according to the server IP address which received the request. [Ken Coar] - PORT: Enable SINGLE_LISTEN_UNSERIALIZED_ACCEPT for AIX 4.3.2 and above. Update AIX configure logic to allow higher AIX release numbers without having to change Apache. [Jeff Trawick] @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.131 2003/07/17 22:55:28 grant Exp $ d94 1 a94 1 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES d96 2 a97 1 APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations d115 1 a115 1 USE_GCC_SHLIB= # defined @ 1.131 log @s/netbsd.org/NetBSD.org/ @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.130 2003/06/06 19:33:12 drochner Exp $ d8 1 a8 2 PKGREVISION= 4 APACHE_VERSION= 1.3.27 d21 1 a21 1 MODSSL_VERSION= 2.8.14 @ 1.130 log @replace ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} by just ${LINK_ALL_LIBGCC_HACK} @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.129 2003/05/31 15:03:17 grant Exp $ d15 1 a15 1 MAINTAINER= jlam@@netbsd.org d20 1 a20 1 SITES_${NETBSD_LOGO}= http://www.netbsd.org/images/logos/ @ 1.129 log @tidy up logic for adding libgcc and libgcc_s. no functional change. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.128 2003/05/31 13:32:49 grant Exp $ d110 1 a110 1 LINK_LIBGCC_LDFLAGS= ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} @ 1.128 log @for consistency, use WHOLE_ARCHIVE_FLAG instead of -Wl,--whole-archive. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.127 2003/05/31 13:30:30 grant Exp $ d108 2 a109 1 .if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" d111 1 a111 2 .endif d114 1 a114 1 .if defined(USE_GCC3) d117 2 a119 2 MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" @ 1.127 log @drop some unnecessary parens @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.126 2003/05/31 13:29:20 grant Exp $ d109 1 a109 1 LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive @ 1.126 log @link against shared libgcc_s when built with gcc3 so Apache modules can resolve the required symbols. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.125 2003/04/15 01:39:15 grant Exp $ d108 1 a108 1 .if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF") @ 1.125 log @be quiet in all targets except post-install. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.124 2003/04/10 19:31:52 wiz Exp $ d110 9 a119 1 .endif @ 1.124 log @Fix fetch stage. Noted broken by grant. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.123 2003/04/10 08:25:21 wiz Exp $ d156 5 a160 5 ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include ${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra ${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod ${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap ${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include d163 1 a163 1 cd ${WRKSRC} && ${CAT} \ d170 1 a170 1 cd ${WRKSRC} && ${TAIL} +160 \ d173 1 a173 1 ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f d176 1 a176 1 cd ${WRKSRC}/src/support; \ d186 1 a186 1 ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f @ 1.123 log @Update to 1.3.27nb4: compile with mod-ssl-2.8.14. Remove quite some lint while here. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.122 2003/03/14 19:38:00 jlam Exp $ d24 1 a24 1 MODSSL_DIST= ${MODSSL_DISTNAME}${EXTRACT_SUFX} @ 1.122 log @(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG; Makefiles simply need to use this value often, for better or for worse. (2) Create a new variable FIX_RPATH that lists variables that should be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and additional variables may be appended from package Makefiles. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.121 2003/02/23 15:55:57 jmmv Exp $ d8 1 a8 1 PKGREVISION= 3 d13 1 a13 2 # This must be defined, before it may be referred to on the LHS. EXTRACT_SUFX= .tar.gz d15 3 a17 2 APACHE_DIST= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${APACHE_DIST} a20 1 DISTFILES+= ${NETBSD_LOGO} d22 1 a22 1 MODSSL_VERSION= 2.8.12 a28 5 DISTFILES+= ${MODSSL_DIST} MAINTAINER= jlam@@netbsd.org HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server @ 1.121 log @Use MASTER_SITE_APACHE. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.120 2003/01/28 22:04:26 jlam Exp $ d131 1 a131 1 LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib @ 1.120 log @Instead of including bsd.pkg.install.mk directly in a package Makefile, have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal . @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.119 2003/01/27 11:10:27 abs Exp $ d11 2 a12 2 MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ @ 1.120.2.1 log @Pull up revisions 1.121, 1.123-1.125, 1.127, 1.131-1.132 (requested by tron in ticket #1380): Use MASTER_SITE_APACHE. Update to 1.3.27nb4: compile with mod-ssl-2.8.14. Remove quite some lint while here. Fix fetch stage. Noted broken by grant. be quiet in all targets except post-install. drop some unnecessary parens s/netbsd.org/NetBSD.org/ Update "apache" package to version 1.3.28. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.120 2003/01/28 22:04:26 jlam Exp $ d8 2 a9 1 APACHE_VERSION= 1.3.28 d11 4 a14 3 MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST} d16 2 a17 3 MAINTAINER= jlam@@NetBSD.org HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server d20 2 a21 1 SITES_${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ d23 1 a23 1 MODSSL_VERSION= 2.8.15 d25 1 a25 1 MODSSL_DIST= ${MODSSL_DISTNAME}.tar.gz d30 5 d114 1 a114 1 .if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" d162 5 a166 5 @@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include @@${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra @@${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod @@${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap @@${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include d169 1 a169 1 @@cd ${WRKSRC} && ${CAT} \ d176 1 a176 1 @@cd ${WRKSRC} && ${TAIL} +160 \ d179 1 a179 1 @@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f d182 1 a182 1 @@cd ${WRKSRC}/src/support; \ d192 1 a192 1 @@${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f @ 1.119 log @Use XARGS="${XARGS}" rather than XARGS=${XARGS} when adding to MAKE_ENV. Avoids breakage on Linux which has XARGS as "usr/bin/xargs -r" @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.118 2003/01/20 22:58:26 jschauma Exp $ d40 1 a210 1 .include "../../mk/bsd.pkg.install.mk" @ 1.118 log @Make this use ${CHOWN}, ${CHMOD}, ${XARGS} and ${FIND}, rather than the hard-coded commands, which may not be in the PATH depending on the operating system. This partly addresses PR pkg/19804. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.117 2002/12/22 13:04:39 grant Exp $ d157 2 a158 2 MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN} XARGS=${XARGS} MAKE_ENV+= FIND=${FIND} @ 1.117 log @Revert to previous behavior and use db1 functions in libc if they are present, rather than installing databases/db (affects NetBSD, Linux, Darwin and possibly others). As suggested by Kimmo Suominen. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.116 2002/12/19 14:08:34 grant Exp $ d156 3 @ 1.116 log @Tidy up conditional use of databases/db/buildlink2.mk. Fixes build problem on Solaris. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.115 2002/11/18 10:40:12 tron Exp $ d118 3 d123 2 a125 1 CONFIGURE_ENV+= LIBS="-ldb2" d127 3 a129 1 .if ${OPSYS} == "SunOS" d131 3 a133 1 CONFIGURE_ENV+= LIBS="-ldbm -ldb2" @ 1.115 log @Fix glitch in last commit. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.114 2002/11/18 10:36:35 tron Exp $ d118 6 a123 1 .if (${OPSYS} == "SunOS") a124 1 CONFIGURE_ENV+= INCLUDES="${BUILDLINK_CPPFLAGS.db}" a125 2 BUILDLINK_DEPENDS.db= db>=2.7.7 . include "../../databases/db/buildlink2.mk" @ 1.114 log @Use "${NONBINMODE}" instead of mode "0" so that "pkg_admin check" still works for a normal user. Also invoke "chmod" only once because fork() and exec() is expensive on certain platforms. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.113 2002/11/18 08:19:37 martti Exp $ d192 1 a192 1 ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/test-cgi @ 1.113 log @Fix chmod (PR#19093 by Adrian Portelli). Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.112 2002/11/15 10:40:26 martti Exp $ d191 2 a192 2 ${CHMOD} 0 ${PREFIX}/libexec/cgi-bin/printenv ${CHMOD} 0 ${PREFIX}/libexec/cgi-bin/test-cgi @ 1.112 log @Updated apache to 1.3.27nb2 chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.111 2002/11/15 09:08:06 martti Exp $ d8 1 a8 1 PKGREVISION= 2 d191 2 a192 1 ${CHMOD} 0 libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi @ 1.111 log @chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.110 2002/10/25 09:00:29 tron Exp $ d8 1 a8 1 PKGREVISION= 1 @ 1.110 log @Update "apache" package to version 1.3.27nb1 which is now based version 2.8.12-1.3.27 of "mod_ssl" module so that one doesn't need two version of the "mod_ssl" sources to build "apache". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.109 2002/10/10 00:52:43 jlam Exp $ d191 1 @ 1.109 log @Fully convert to buildlink2, even on Solaris. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.108 2002/10/04 19:14:02 tron Exp $ d8 1 d23 1 a23 1 MODSSL_VERSION= 2.8.11 @ 1.108 log @Update "apache" package to version 1.3.27. This version fixes many bugs discovered in version 1.3.26 including these security fixes: - SECURITY: CAN-2002-0840 (cve.mitre.org) Prevent a cross-site scripting vulnerability in the default error page. The issue could only be exploited if the directive UseCanonicalName is set to Off and a server is being run at a domain that allows wildcard DNS. [Matthew Murphy] - SECURITY CAN-2002-0843 (cve.mitre.org) Fix some possible overflows in ab.c that could be exploited by a malicious server. Reported by David Wagner. [Jim Jagielski] - SECURITY CAN-2002-0839 (cve.mitre.org) Add the new directive 'ShmemUIDisUser'. By default, Apache will no longer set the uid/gid of SysV shared memory scoreboard to User/Group, and it will therefore stay the uid/gid of the parent Apache process. This is actually the way it should be, however, some implementations may still require this, which can be enabled by 'ShmemUIDisUser On'. Reported by iDefense. [Jim Jagielski] @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.107 2002/09/26 01:48:29 grant Exp $ d119 1 a119 1 CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2" d122 1 a122 1 .include "../../databases/db/buildlink.mk" @ 1.107 log @Explicitly turn on large file support, as some Apache modules have problems when it is not enabled, notably mod_perl. Fixes pkg/18070 from myself, ok'd by wiz. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.106 2002/09/20 01:53:14 jlam Exp $ d8 1 a8 2 APACHE_VERSION= 1.3.26 PKGREVISION= 5 d22 1 a22 1 MODSSL_VERSION= 2.8.10 @ 1.106 log @Fix typo, from pkg/18336 by Joachim Koenig-Baltes. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.105 2002/09/19 09:04:28 jlam Exp $ d9 1 a9 1 PKGREVISION= 4 d104 4 @ 1.105 log @Take advantage of the auto-generation and installation of rc.d scripts. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $ d116 1 a116 1 CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db2}/include/db2" @ 1.104 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.92.2.3 2002/08/22 11:12:54 jlam Exp $ a174 1 @@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh a186 1 ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache @ 1.103 log @Crank libmm dependency versions and dependent pkg revisions. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.102 2002/07/30 18:40:14 wiz Exp $ d39 1 a39 1 USE_BUILDLINK_ONLY= YES d51 1 a51 1 CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_DIR}" d116 1 a116 1 CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_DIR}/include/db2" d190 3 a192 2 .include "../../devel/libmm/buildlink.mk" .include "../../textproc/expat/buildlink.mk" @ 1.103.4.1 log @Pullup the following versions: ap-ssl/Makefile 1.61 ap-ssl/distinfo 1.14 apache/Makefile 1.108 apache/PLIST 1.7 apache/distinfo 1.23 to the netbsd-1-6 branch of pkgsrc. Requested by Manuel Bouyer. These patches update apache and ap-ssl for securities issues. Tested on one 1.6 and 2 1.5.3 servers with a few other modules (ap-php, ap-roaming) without problems. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.103 2002/08/01 00:58:33 mycroft Exp $ d8 2 a9 1 APACHE_VERSION= 1.3.27 d23 1 a23 1 MODSSL_VERSION= 2.8.11 @ 1.102 log @Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.101 2002/06/24 16:26:18 taca Exp $ d9 1 a9 1 PKGREVISION= 3 @ 1.101 log @Update to mod_ssl to 2.8.10. Since apache package contains it, bump PKGREVISION. Changes with mod_ssl 2.8.10 (19-Jun-2002 to 24-Jun-2002) *) Fixed off-by-one buffer overflow bug in the compatibility functionality (mapping of old directives to new ones). *) Fixed memory leak in processing of CA certificates. *) In case there is actually a certificate chain in the session cache, we now use the value of SSL_get_peer_certificate(ssl) to verify as it will have been removed from the chain before it was put in the cache. *) Seed the PRNG with a maximum of 1K from the internal scoreboard. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.100 2002/06/20 17:12:36 taca Exp $ d6 4 a9 3 DISTNAME= apache_1.3.26 PKGNAME= apache-1.3.26 PKGREVISION= 2 d23 2 a24 1 MODSSL_DISTNAME= mod_ssl-2.8.10-1.3.26 d34 1 a34 1 COMMENT= HTTP (Web) server d36 1 a36 1 CONFLICTS= apache-*modssl-[0-9]* apache6-[0-9]* d47 1 d56 4 d62 7 a69 1 APACHE_SUEXEC_USER?= www d73 1 a73 1 --suexec-caller=${APACHE_SUEXEC_USER} \ a78 1 PKG_USERS= ${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user d85 1 a85 1 d88 1 a88 2 CONFIGURE_ARGS+= --enable-shared=proxy CONFIGURE_ARGS+= --enable-shared=define # from mod_ssl pkg.addon d91 1 a91 2 CONFIGURE_ARGS+= --disable-module=proxy CONFIGURE_ARGS+= --disable-shared=define d93 1 d95 2 a96 1 PLIST_SRC+= ${PKGDIR}/PLIST d135 7 a141 3 OWN_DIRS= /var/log/httpd OWN_DIRS+= /var/spool/httpd OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755 @ 1.100 log @- Add share/httpd/htdocs/index.html.lb.utf8 to PLIST. - Prevent chown whole files under ${PREFIX}/share/httpd. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.99 2002/06/19 15:22:36 tron Exp $ d8 1 a8 1 PKGREVISION= 1 d22 1 a22 1 MODSSL_DISTNAME= mod_ssl-2.8.9-1.3.26 @ 1.99 log @Add missing "source/" to master site entries for "ftp.funet.fi". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.98 2002/06/19 15:14:16 fredb Exp $ d49 1 a172 1 ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd @ 1.98 log @Define ${EXTRACT_SUFX} before referring to it on the left hand side (indirectly, through ``SITES_${MODSSL_DIST}=''), and add a comment regarding same, to help spare maintainers from brain-damage. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.97 2002/06/19 14:07:51 tron Exp $ d27 1 a27 1 ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/ @ 1.97 log @Use the same master sites of the "mod_ssl" as in the "ap-ssl" package. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.96 2002/06/19 11:03:59 jdolecek Exp $ d12 2 @ 1.96 log @update for now-available mod_ssl-2.8.9-1.3.26 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.95 2002/06/19 10:17:58 jdolecek Exp $ d23 3 a25 1 SITES_${MODSSL_DIST}= http://www.modssl.org/source/ @ 1.95 log @Update apache to 1.3.26. Custom mod_ssl eapi patch used for now, since update of mod_ssl for 1.3.26 isn't available yet. This fixes the CAN-2002-0392 (mitre.org) [CERT VU#944335] security issue. For full list of changes, see http://www.apache.org/dist/httpd/CHANGES_1.3 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.94 2002/06/18 02:06:01 itojun Exp $ d8 1 d20 1 a20 1 MODSSL_DISTNAME= mod_ssl-2.8.8-1.3.24 a128 2 # XXX one mod_ssl-2.2.801.3.26 would be available, use their own patch # and g/c files/mod_ssl-2.2.8-1.3.26-eapi.patch d132 1 a132 1 ${FILESDIR}/mod_ssl-2.2.8-1.3.26-eapi.patch \ @ 1.94 log @crank PKGREVISION @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.93 2002/05/08 11:44:51 kleink Exp $ d6 2 a7 3 DISTNAME= apache_1.3.24 PKGNAME= apache-1.3.24 PKGREVISION= 1 d128 2 d133 1 a133 1 ${MODSSL_SRC}/pkg.eapi/eapi.patch \ @ 1.93 log @G/c references to ftp.uni-trier.de. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.92 2002/04/02 14:13:01 jlam Exp $ d8 1 a8 1 PKGREVISION= # empty @ 1.92 log @Update www/apache to 1.3.24 with EAPI patch from mod_ssl-2.8.8-1.3.24. Relevant changes from version 1.3.23 include: * Prevent invalid client hostnames from appearing in the log file. * Various mod_proxy improvements, such as the new ProxyIOBufferSize directive. * The new ''IgnoreCase' keyword to the IndexOptions directive. * mod_rewrite's 'rnd' was broken and has been fixed. * The '-S' option of 'apxs' was not able to handle quotes; also 'apxs' is now rebuilt when options are changed. * proxy now correctly handles Cookies and X-Cache headers. * Fixed a problem in TPF when we were using the wrong subpool when opening the error log. * pthread accept() mutexes on Solaris were broken (since we were not linking against pthread) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.91 2002/02/28 05:45:33 jlam Exp $ d23 1 a23 2 SITES_${MODSSL_DIST}= http://www.modssl.org/source/ \ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/ @ 1.92.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.100 2002/06/20 17:12:36 taca Exp $ d6 3 a8 3 DISTNAME= apache_1.3.26 PKGNAME= apache-1.3.26 PKGREVISION= 1 a11 2 # This must be defined, before it may be referred to on the LHS. EXTRACT_SUFX= .tar.gz d20 1 a20 1 MODSSL_DISTNAME= mod_ssl-2.8.9-1.3.26 d24 1 a24 2 ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/ a45 1 CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} d169 1 @ 1.92.2.2 log @Convert from using buildlink1 to using the new buildlink2 framework. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.92.2.1 2002/06/23 19:03:25 jlam Exp $ d37 1 a37 1 USE_BUILDLINK2= YES d48 1 a48 1 CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}" d104 1 a104 1 CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db2}/include/db2" d174 2 a175 3 .include "../../devel/libmm/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" @ 1.92.2.3 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.92.2.2 2002/07/01 17:45:14 jlam Exp $ d6 3 a8 4 DISTNAME= apache_${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} APACHE_VERSION= 1.3.26 PKGREVISION= 4 d22 1 a22 2 MODSSL_VERSION= 2.8.10 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-${APACHE_VERSION} d32 1 a32 1 COMMENT= Apache HTTP (Web) server d34 1 a34 1 CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* a44 1 CONFIGURE_ARGS+= --without-confadjust a52 4 .if empty(STRIPFLAG) CONFIGURE_ARGS+= --without-execstrip .endif a54 7 APACHE_USER?= www APACHE_GROUP?= www BUILD_DEFS+= APACHE_USER APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} d56 1 d60 1 a60 1 --suexec-caller=${APACHE_USER} \ d66 1 d73 1 a73 1 # d76 2 a77 1 _ENABLE_MOD= --enable-shared d80 2 a81 1 _ENABLE_MOD= --enable-module d83 1 a85 3 CONFIGURE_ARGS+= ${_ENABLE_MOD}=proxy CONFIGURE_ARGS+= ${_ENABLE_MOD}=define # from mod_ssl pkg.addon d123 3 a125 7 OWN_DIRS+= ${PREFIX}/lib/httpd OWN_DIRS+= /var/httpd OWN_DIRS+= /var/log/httpd OWN_DIRS_PERMS+= /var/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user @ 1.91 log @Update www/apache to 1.3.23nb1. Changes from version 1.3.23 include using the EAPI patches from modssl-2.8.7-1.3.23. Also, link against the MM Shared Memory library (devel/libmm) to provide shared memory support in Apache/EAPI. For example, this allows mod_ssl to use a high-performance RAM-based session cache instead of a disk-based one. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.90 2002/02/05 05:35:11 jmc Exp $ d6 3 a8 3 DISTNAME= apache_1.3.23 PKGNAME= apache-1.3.23 PKGREVISION= 1 d11 1 a11 4 http://www.apache.de/dist/httpd/ \ http://www.netbsd.org/images/logos/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif d13 11 a23 1 MASTER_SITES+= http://www.modssl.org/source/ \ d25 1 a25 3 DISTFILES+= ${MODSSL_DISTNAME}${EXTRACT_SUFX} MODSSL_DISTNAME= mod_ssl-2.8.7-1.3.23 MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} d117 2 @ 1.90 log @Remove the perl buildlink. I disagree that installing a perl script shouldn't commit the package to depending on perl as well but that seems to be the current way it's done for apache. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.89 2002/02/05 04:45:29 jmc Exp $ d8 1 d19 1 a19 1 MODSSL_DISTNAME= mod_ssl-2.8.6-1.3.23 d40 1 d164 1 @ 1.89 log @Apache installs apxs which is a perl script so the package needs to depend on perl as well. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.88 2002/02/01 16:04:39 jlam Exp $ a162 1 .include "../../lang/perl5/buildlink.mk" @ 1.88 log @Update apache to 1.3.23 with the EAPI patch from mod_ssl-2.8.6-1.3.23. The main new features in 1.3.23 (compared to 1.3.22) are: * HTTP/1.1 support for mod_proxy. * Other mod_proxy improvements. * The new 'FileETag' directive to allow one to build the format of the ETag via runtime directives. * Addition of a 'filter callback' function to enable modules to intercept the output byte stream for dynamic page caching. The following bugs were found in Apache 1.3.22 and have been fixed in Apache 1.3.23: * Fix incorrect "Content-Length" header in the 416 response. * Revert mod_negotation's handling of path_info and query_args to the 1.3.20 behavior (PRs: 8628, 8582, 8538). * Prevent an Apache module from being loaded or added twice due to duplicate LoadModule or AddModule directives. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.87 2002/01/01 06:12:05 jlam Exp $ d163 1 @ 1.87 log @Fix installation so that existing config files are preserved when building from source instead of installing from a binary package (problem noted in private email by George Coulouris . Also move the ownership of SSL-related config directories to the www/ap-ssl package. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.86 2001/12/26 21:20:27 jlam Exp $ d6 2 a7 2 DISTNAME= apache_1.3.22 PKGNAME= apache-1.3.22 d18 1 a18 1 MODSSL_DISTNAME= mod_ssl-2.8.5-1.3.22 @ 1.86 log @(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.85 2001/12/02 06:56:45 jlam Exp $ d110 1 a110 6 OWN_DIRS= ${PKG_SYSCONFDIR}/ssl.crl OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.crt OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.csr OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.key OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.prm OWN_DIRS+= /var/log/httpd @ 1.85 log @bsd.pkg.install.mk calls the INSTALL script at the right times automatically, so no need to do it ourselves. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.84 2001/11/25 18:59:48 jlam Exp $ d45 7 a51 3 APACHE_USER?= www APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin d53 1 a53 3 --suexec-caller=${APACHE_USER} \ --suexec-safepath='${SUEXEC_PATH}' \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} d55 2 a56 1 BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT d146 1 a146 1 ${SED} ${FILES_SUBST_SED} \ d151 1 a151 1 ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh @ 1.84 log @PKG_SYSCONFDIR is where the configuration files for a package may be found. This value may be customized in various ways: PKG_SYSCONFBASE is the main config directory under which all package configuration files are to be found. PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found. PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a particular package. Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the default location of ${PREFIX}/etc. This obsoletes the use of CONFDIR, which was active for only 6 days, so no need to have a workaround to still accept old CONFDIR settings. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.83 2001/11/21 15:44:23 jlam Exp $ a162 1 PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL @ 1.83 log @RCD_SCRIPTS now just lists the filenames (see bsd.pkg.install.mk). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.82 2001/11/19 16:23:12 jlam Exp $ d42 1 a42 3 APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} d102 3 a104 3 CONF_FILES= ${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf SUPPORT_FILES= ${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic SUPPORT_FILES+= ${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types d107 5 a111 6 MAKE_DIRS= ${APACHE_SYSCONFDIR} OWN_DIRS= ${APACHE_SYSCONFDIR}/ssl.crl OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.crt OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.csr OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.key OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.prm d156 1 a156 1 ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default \ d158 1 a158 1 ${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default; \ @ 1.82 log @Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in bsd.pkg.install.mk: * Remove old DEINSTALL/INSTALL scripts. * Move some text printed at POST-INSTALL time into the MESSAGE file. * Adjust rc.d scripts to respect rc.conf settings, so that the script may be directly copied into /etc/rc.d. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.81 2001/10/22 18:02:51 jlam Exp $ d107 1 a107 1 RCD_SCRIPTS= ${PREFIX}/etc/rc.d/apache /etc/rc.d/apache @ 1.81 log @Don't do the dance with ROOT_GROUP. Apache extension modules installed by apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}", which should do the right thing regardless of the platform. ${INSTALL} is replaced with the full path to the install program used by pkgsrc, which should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris. This should fix pkg/14232 by Pierre Bourgin. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.80 2001/10/20 17:46:50 jlam Exp $ d42 1 a42 1 APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd d44 1 d102 1 a102 2 DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL d104 14 a117 14 # Given foo=${bar}, replace @@foo@@ with ${bar}. # FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} FILES_SUBST+= CAT=${CAT:Q} FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= CHOWN=${CHOWN:Q} FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= PREFIX=${PREFIX} FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= RMDIR=${RMDIR:Q} FILES_SUBST+= TRUE=${TRUE:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@@!/:S/$/!g/:S/^/-e s!@@/} a151 2 ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} d169 1 @ 1.80 log @Only link -lgcc whole-archive on NetBSD ELF platforms, to allow a.out platforms to correctly links this package. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.79 2001/10/19 09:52:22 veego Exp $ a41 6 .if ${OPSYS} == "SunOS" ROOT_GROUP?= root .else ROOT_GROUP?= wheel .endif d140 4 a143 3 ${SED} -e "s|@@ROOT_GROUP@@|${ROOT_GROUP}|" < ${WRKSRC}/src/support/apxs.pl > \ ${WRKSRC}/src/support/apxs.pl.sed ${MV} ${WRKSRC}/src/support/apxs.pl.sed ${WRKSRC}/src/support/apxs.pl d167 1 a167 2 ${CHOWN} -R root ${PREFIX}/share/httpd ${CHGRP} -R ${ROOT_GROUP} ${PREFIX}/share/httpd @ 1.79 log @Define a ROOT_GROUP, which defaults to root on SunOS, otherwise to wheel. Using -o 0 and -g 0 doesn't work with the ucb install on Solaris. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.78 2001/10/17 19:17:00 jlam Exp $ d86 3 a88 3 # On NetBSD, we need to link libgcc.a whole-archive so that certain symbols # from the C++ implementation (__get_eh_context, etc.) referenced by DSOs # written in C++ will resolve correctly. d90 1 a90 1 .if (${OPSYS} == "NetBSD") @ 1.78 log @Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.77 2001/10/16 04:11:06 jlam Exp $ d42 6 d145 5 d172 2 @ 1.77 log @Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are: On NetBSD, we need to link libgcc.a whole-archive so that certain symbols from the C++ implementation (__get_eh_context, etc.) referenced by DSOs written in C++ will resolve correctly. This makes php4-sablot work with mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.76 2001/09/27 23:18:51 jlam Exp $ d6 2 a7 2 DISTNAME= apache_1.3.20 PKGNAME= apache-1.3.20nb1 d18 1 a18 1 MODSSL_DISTNAME= mod_ssl-2.8.4-1.3.20 d28 2 a29 1 HAS_CONFIGURE= # defined d90 2 a91 4 DEPENDS+= db-2.7.7:../../databases/db LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib \ -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib CONFIGURE_ENV+= INCLUDES="-I${LOCALBASE}/include/db2" d93 2 d163 1 @ 1.76 log @Mechanical changes to 375 files to change dependency patterns of the form foo-* to foo-[0-9]*. This is to cause the dependencies to match only the packages whose base package name is "foo", and not those named "foo-bar". A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net. Also change dependency examples in Packages.txt to reflect this. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.75 2001/07/13 07:09:24 jlam Exp $ d7 1 a7 1 PKGNAME= apache-1.3.20 d77 9 @ 1.75 log @In package Makefiles, create FILES_SUBST instead of duplicating sed expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s" instead of "diff -q" since the former is more portable across OSes. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.74 2001/07/09 02:45:09 hubertf Exp $ d25 1 a25 1 CONFLICTS= apache-*modssl-* apache6-* @ 1.74 log @Solaris doesn't know about xargs -0 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.73 2001/06/09 06:36:42 jlam Exp $ d100 1 @ 1.73 log @Update apache to 1.3.20. Relevant changes from version 1.3.19 include: NetBSD Packages Collection (pkgsrc) changes: * Modify French page in same way as the English page. Translation provided by Remi Zara in private e-mail. * Use EAPI patches from mod_ssl-2.8.4-1.3.20. * Unify repeated SED replacement info for config.layout, apache.sh, DEINSTALL, and INSTALL into one location, FILES_SUBST. * Modify patch to apxs to use 0:0 instead of root:wheel, as some non-NetBSD systems don't have a wheel group. The general bug fixes: * Eliminate a potential segfault if an invalid floating point value is passed to the ap_snprintf() function, on platforms supporting isnan() and isinf(). * Fix a possible segfault at startup in the detection of a default ServerName or IP string when no ServerName was specified. * Fixed mod_proxy to retain empty headers, as allowed by RFC2068. * Properly resolve the location of ndbm on Linux and some glibc2 builds, where ndbm.h is in the nonstandard db1/ subdir. The main new features include: * Enhanced rotatelogs to allow a UTC offset to be specified, and the format logfile names with human-readable date/time stamps. * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all* normal URI escaping. Note incautious use can give unexpected results or introduce security risks. * Added the '\' character to RewriteRule to allow escaping of special characters. Allows embedding of both the '$' and '%' characters in the results, so 'foo\$1' translates to 'foo$1' rather than 'foo\'. * Added the -V flag to suexec, to display the compile-time settings with which it was built. (Only valid for root or the HTTPD_USER username.) * Introduced EBCDIC conversion configuration options, controlling the conversion based on MIME type or file suffix. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.72 2001/05/18 06:01:35 jlam Exp $ d126 1 a126 1 ${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 ${RM} -f d133 1 a133 1 ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print0 | ${XARGS} -0 ${RM} -f @ 1.72 log @Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in /etc/mk.conf to any string of legal compiler flags to tune different aspects of the built httpd. @ text @d1 1 a1 1 # $NetBSD$ d6 2 a7 2 DISTNAME= apache_1.3.19 PKGNAME= apache-1.3.19nb2 d18 1 a18 1 MODSSL_DISTNAME= mod_ssl-2.8.3-1.3.19 d56 4 d94 13 a106 3 # Note that there is NO static compile module hook here. This is intentional. # Under Apache 1.3, modules can be compiled to link dynamically to the server # using the "apxs" program. See apxs(8). d123 1 a123 1 cd ${WRKSRC} && ${TAIL} +154 \ d126 1 a126 1 ${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \; d129 1 a129 2 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" \ -e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g" \ d133 4 a136 17 ${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \; ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" \ -e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g" \ ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh ${SED} -e "s|@@CAT@@|${CAT}|g" \ -e "s|@@RM@@|${RM}|g" \ -e "s|@@RMDIR@@|${RMDIR}|g" \ -e "s|@@TRUE@@|${TRUE}|g" \ -e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g" \ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s|@@CAT@@|${CAT}|g" \ -e "s|@@CHMOD@@|${CHMOD}|g" \ -e "s|@@CHOWN@@|${CHOWN}|g" \ -e "s|@@CP@@|${CP}|g" \ -e "s|@@MKDIR@@|${MKDIR}|g" \ -e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g" \ ${PKGDIR}/INSTALL > ${INSTALL_FILE} d143 2 a144 2 for i in httpd.conf magic mime.types; do \ ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$$i.default \ d146 1 a146 1 ${RM} -f ${APACHE_SYSCONFDIR}/$$i.default; \ @ 1.71 log @Revert last change...MAKE is now added CONFIGURE_ENV in bsd.pkg.mk. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.70 2001/05/17 16:32:26 abs Exp $ d37 1 a37 1 CONFIGURE_ENV+= OPTIM="${OPTIM}" d68 2 d71 2 a72 2 OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations d83 3 a85 1 BUILD_DEFS+= APACHE_PERF_TUNING APACHE_SUEXEC @ 1.70 log @Add MAKE="${MAKE}" to CONFIGURE_ENV, otherwise on Linux apache configures to use gmake when when it is being compiled with bmake, and much pain ensues @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.69 2001/05/14 14:02:02 jlam Exp $ a37 1 CONFIGURE_ENV+= MAKE="${MAKE}" # Needed on Linux @ 1.69 log @Update apache to 1.3.19nb2. The only change from version 1.3.19nb1 is using the updated EAPI patches from mod_ssl-2.8.3-1.3.19 which includes the following fix: *) Fixed EAPI context usage in http_request.c: a context pointer potentially can be NULL requests and can cause a segfault if dereferenced. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.68 2001/05/08 17:28:09 jlam Exp $ d38 1 @ 1.68 log @Allow changing document root for suexec through ${APACHE_SUEXEC_DOCROOT}. Closes pkg/12852 by Eric Schnoebelen . @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.67 2001/04/29 21:21:13 jlam Exp $ d7 1 a7 1 PKGNAME= apache-1.3.19nb1 d18 1 a18 1 MODSSL_DISTNAME= mod_ssl-2.8.2-1.3.19 @ 1.67 log @Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@@netbsd.org. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.66 2001/04/29 20:42:28 jlam Exp $ d46 1 d50 2 a51 1 --suexec-safepath='${SUEXEC_PATH}' d53 1 a53 1 BUILD_DEFS+= APACHE_USER @ 1.66 log @Update apache to 1.3.19nb1. Changes from 1.3.19 include using mod_ssl 2.8.2 patches and more thorough use of APACHE_SYSCONFDIR setting. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.65 2001/04/14 19:50:04 kim Exp $ a10 2 http://www.modssl.org/source/ \ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/ \ a12 1 ${MODSSL_DISTNAME}${EXTRACT_SUFX} \ d15 6 a25 3 MODSSL_DISTNAME= mod_ssl-2.8.2-1.3.19 MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} @ 1.65 log @Fix MASTER_SITES @ text @d1 1 a1 5 # $NetBSD: Makefile,v 1.64 2001/04/14 19:42:53 kim Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl # EAPI when there has been no change to the Apache version number). d7 1 a7 1 PKGNAME= apache-1.3.19 d24 1 a24 1 MODSSL_DISTNAME= mod_ssl-2.8.1-1.3.19 d113 2 a114 1 post-build: d116 1 a117 3 pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \; @ 1.64 log @Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.63 2001/03/13 20:52:26 jlam Exp $ d13 2 a14 2 MASTER_SITES= http://httpd.apache.org/dist/ \ http://www.apache.de/dist/ \ @ 1.63 log @Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename(). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.62 2001/02/17 17:21:54 wiz Exp $ d45 3 d114 1 d127 1 d134 1 d141 6 @ 1.62 log @Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.61 2001/02/13 11:38:23 kei Exp $ d10 2 a11 2 DISTNAME= apache_1.3.17 PKGNAME= apache-1.3.17.1 d19 1 a19 1 ${SSL_DISTNAME}${EXTRACT_SUFX} \ a21 3 PATCH_SITES= http://httpd.apache.org/dist/ PATCHFILES= apache_1.3.17-fix.diff d28 2 a29 1 SSL_DISTNAME= mod_ssl-2.8.0-1.3.17 d33 2 a34 13 CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sbindir=${PREFIX}/sbin \ --libexecdir=${PREFIX}/lib/httpd \ --sysconfdir=${PREFIX}/etc/httpd \ --datadir=${PREFIX}/share/httpd \ --cgidir=${PREFIX}/libexec/cgi-bin \ --includedir=${PREFIX}/include/httpd \ --runtimedir=/var/run \ --logfiledir=/var/log/httpd \ --proxycachedir=/var/spool/httpd/proxy CONFIGURE_ARGS+= --enable-rule=EAPI \ --enable-module=most \ --disable-module=ssl \ d37 2 d58 1 d62 1 d91 4 a94 4 ${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap ${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include ${CHMOD} a-x ${WRKSRC}/htdocs/README.rus ${WRKSRC}/htdocs/index.* \ ${WRKSRC}/htdocs/apache_pb.gif d98 5 a102 4 ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/eapi.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \ d105 1 a105 1 ${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \ d109 4 d114 1 a114 1 ${SED} -e "s,@@PREFIX@@,${PREFIX},g" \ @ 1.61 log @Workaround for file permission problem of htdocs/index.html.*. Problem report submitted to the author. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.60 2001/02/07 09:56:45 tron Exp $ d27 1 @ 1.60 log @Add missing directory name "source" to URL for German "mod_ssl" mirror. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.59 2001/02/07 09:52:45 tron Exp $ d101 2 @ 1.59 log @Add German mirror sites. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.58 2001/02/06 12:38:59 itojun Exp $ d16 1 a16 1 ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \ @ 1.58 log @pull in official fix from apache. make the version number 1.3.17.1 (hope it is the right way). >There's another bug in RewriteMap handling in Apache 1.3.17, which >causes ${} expansions to be completely ignored. This patch fixes it. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.57 2001/02/02 16:39:56 jlam Exp $ d14 1 d16 1 @ 1.57 log @Update apache to 1.3.17. Important changes from version 1.3.14 include: -) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI mis-interaction seems to be gone and I wasn't able to reproduce it on my system. *) Fix the declaration of the module structure in mod_example. *) Fix the handling of variable expansion look-ahead in mod_rewrite, i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of more complicated nested RewriteMap lookups. *) mod_status now respects ?refresh=n of 1 or greater. If the given refresh value is not a number, ?refresh is set to 1 second. *) Accomodate an out-of-space condition in the piped logs and the rotatelogs.c code, and no longer churn log processes for this condition. *) Make cgi-bin work as a regular directory when using mod_vhost_alias with no VirtualScriptAlias directives. *) Move the check of the Expect request header field after the hook for ap_post_read_request, since that is the only opportunity for modules to handle Expect extensions. *) Eliminate caching problems of mod_autoindex results, so the last modified date of the directory is returned as the Last-Modified and ETag HTTP header tags are sent if IndexOptions TrackModified directive/option is used. *) Correct an issue with Alias and ScriptAlias directives that file path arguments were not normalized in canonical form. This correction makes no attempt to normalize regular expression forms of Alias or ScriptAlias. *) Add a new LogFormat directive, %c, that will log connection status at the end of the response. *) Update the mime.types file to the registered media types as of 2000-10-19. *) Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.56 2001/01/13 15:25:04 tv Exp $ d11 1 a11 1 PKGNAME= apache-1.3.17 d19 3 @ 1.56 log @Use the "nb" convention to distinguish the teeny version bump caused by pkgsrc (instead of a real version number change in the program). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.55 2000/12/22 19:41:52 jlam Exp $ d10 2 a11 2 DISTNAME= apache_1.3.14 PKGNAME= apache-1.3.14nb1 d13 2 a14 2 MASTER_SITES= http://www.apache.org/dist/ \ ftp://ftp.modssl.org/source/ \ d21 1 a21 1 HOMEPAGE= http://www.apache.org/ d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.7.1-1.3.14 d29 14 a42 10 CONFIGURE_ARGS+= --prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \ --runtimedir=/var/run --datadir=${PREFIX}/share/httpd \ --cgidir=${PREFIX}/libexec/cgi-bin \ --logfiledir=/var/log/httpd \ --sysconfdir=${PREFIX}/etc/httpd \ --proxycachedir=/var/spool/httpd/proxy \ --includedir=${PREFIX}/include/httpd \ --sbindir=${PREFIX}/sbin CONFIGURE_ARGS+= --enable-rule=EAPI --enable-module=most \ --disable-module=ssl --enable-module=auth_db \ d44 1 a45 1 CONFIGURE_ARGS+= --with-perl=${PERL5} d53 2 a54 1 CONFIGURE_ARGS+= --enable-suexec --suexec-caller=${APACHE_USER} \ d77 2 a78 1 LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib d98 5 a102 5 cd ${WRKSRC} && ${CAT} \ ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/eapi.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \ ${WRKDIR}/${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \ d104 2 a105 2 cd ${WRKSRC} && ${TAIL} +148 \ ${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \ d110 2 a111 2 ${SED} -e "s,@@PREFIX@@,${PREFIX},g" \ < ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh d115 11 a125 10 ${SED} -e "s,@@CAT@@,${CAT},g" \ -e "s,@@RM@@,${RM},g" \ -e "s,@@RMDIR@@,${RMDIR},g" \ -e "s,@@TRUE@@,${TRUE},g" \ < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@@CAT@@,${CAT},g" \ -e "s,@@CHMOD@@,${CHMOD},g" \ -e "s,@@CP@@,${CP},g" \ -e "s,@@MKDIR@@,${MKDIR},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} @ 1.55 log @Make the INSTALL/DEINSTALL scripts handle configuration files like cups: copy sample config files to default config files, and remove the config files on deinstall if they're identical to the sample ones. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.54 2000/12/11 00:03:08 jlam Exp $ d11 1 a11 1 PKGNAME= apache-1.3.14.1 @ 1.54 log @Introduce APACHE_USER: the user allowed to execute the suexec wrapper if apache was build with APACHE_SUEXEC == YES. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.53 2000/10/17 18:14:15 jlam Exp $ d79 3 d109 10 @ 1.53 log @Update ap-ssl to 2.7.1 using mod_ssl-2.7.1-1.3.14. Also update apache to 1.3.14.1, adding a superminor version number to indicate possible EAPI update. *) Fixed the parsing of SSLSessionCache directives. The prefixes were incorrectly skipped and leaded to "unable to open semaphore file" errors. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.52 2000/10/13 21:46:45 jlam Exp $ d47 1 d49 1 a49 1 CONFIGURE_ARGS+= --enable-suexec --suexec-caller=www \ d52 1 @ 1.52 log @Update apache to 1.3.14. Changes from version 1.3.12 are listed below. The security fixes are: * A problem with the Rewrite module, mod_rewrite, allowed access to any file on the web server under certain circumstances * The handling of Host: headers in mass virtual hosting configurations, mod_vhost_alias, could allow access to any file on the server * If a cgi-bin directory is under the document root, the source to the scripts inside it could be sent if using mass virtual hosting The main new features include: * Support for a directory-based configuration system. If any of the configuration directives point to directories instead of files, all files in that directory (and in subdirectories) will be also parsed as configuration files * Support name-based virtual hosting without needing to specify an IP address in the Apache configuration file. This enables sites that use dynamic IP addresses to support name-based virtual hosting as well as allowing identical machines to share a configuration file, say in a load-balanced cluster * The SetEnvIf and BrowserMatch range of directives are now able to be used in .htaccess files. * Administrators who are nervous about their full server version details being public can use the new keyword 'ProductOnly' in the ServerTokens directive. This keyword forces the server to only return the string "Apache" as the server version. * The new digest authentication module, mod_auth_digest has had a number of fixes and upgrades applied @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.51 2000/09/20 05:14:12 jlam Exp $ d11 1 a11 1 PKGNAME= apache-1.3.14 d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.7.0-1.3.14 @ 1.51 log @Install rc.d control script as "foo" instead of "foo.sh" to comply with how NetBSD's rc.d system interprets script names. Also add appropriate REQUIRE and PROVIDE sections to allow direct use in NetBSD's rc.d system. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.50 2000/09/12 19:39:02 thorpej Exp $ d10 2 a11 2 DISTNAME= apache_1.3.12 PKGNAME= apache-1.3.12 d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.6.6-1.3.12 d96 1 a96 3 post-patch: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \; d101 3 @ 1.50 log @Don't pass --disable-suexec. The configure script doens't accept it, and the default is "off" anyhow. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.49 2000/09/12 14:17:31 jlam Exp $ d109 1 a109 1 ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh @ 1.49 log @Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl. EAPI didn't change so no need to change Apache's version number. Also standardize package builds to have Apache listen on ports 80/443 regardless of UID of user that builds the package, and make MAINTAINER point to me. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.48 2000/09/06 06:17:55 jlam Exp $ a50 2 .else CONFIGURE_ARGS+= --disable-suexec @ 1.48 log @* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.47 2000/08/28 09:14:52 jlam Exp $ d20 1 a20 1 MAINTAINER= tron@@netbsd.org d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.6.3-1.3.12 d40 1 d51 2 d56 2 a57 1 CONFIGURE_ARGS+= --enable-module=so --enable-shared=proxy d95 1 a95 1 cd ${WRKSRC} && ${TAIL} +156 \ @ 1.47 log @Use PERL5 variable for location of perl5 binary. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.46 2000/04/24 13:13:22 tron Exp $ d28 1 a28 1 HAS_CONFIGURE= YES d32 2 a33 1 --logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \ d36 2 a37 2 --sbindir=${PREFIX}/sbin \ --enable-rule=EAPI --enable-module=most \ d39 2 a40 2 --disable-module=auth_dbm \ --with-perl=${PERL5} d46 1 d48 2 a49 1 --suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin' d52 9 a72 2 PLIST_SRC= ${WRKDIR}/PLIST d80 3 a82 3 @@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/ @@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/ @@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/ d85 5 a89 5 @@cd ${WRKSRC} && ${CAT} \ ../${SSL_DISTNAME}/pkg.eapi/eapi.patch \ ../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \ ../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \ ../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \ d91 2 a92 2 @@cd ${WRKSRC} && ${TAIL} +156 \ ../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \ d96 1 a96 1 @@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} -f d99 2 a100 2 ${SED} s#@@PREFIX@@#${PREFIX}#g <${FILESDIR}/apache.sh \ >${WRKDIR}/apache.sh d103 4 a106 2 ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \ ${PREFIX}/share/httpd/htdocs d108 1 a108 9 @@${MV} ${PREFIX}/lib/httpd/libproxy.so \ ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \ ${MKDIR} ${PREFIX}/lib/httpd @@${CP} ${PKGDIR}/PLIST ${PLIST_SRC} .for FILE in man/man8/suexec.8 sbin/suexec @@if ${TEST} -e ${PREFIX}/${FILE} ; then \ ${ECHO} ${FILE} >>${PLIST_SRC}; \ fi .endfor a110 6 .if !defined(NOPIC) CONFIGURE_ARGS+= --enable-module=so --enable-shared=proxy .else CONFIGURE_ARGS+= --disable-module=proxy .endif @ 1.46 log @Finish half done update of "apache" package to 1.3.12. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.45 2000/04/05 21:05:30 cjs Exp $ d39 1 a39 1 --with-perl=${PREFIX}/bin/perl @ 1.45 log @I've not maintained this for a long time, but nobody else has taken over and put his name in. So I'm arbitrarily changeing the maintainer to the guy with the most commits to the Makefile. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.44 2000/02/22 17:38:16 veego Exp $ d10 2 a11 2 DISTNAME= apache_1.3.11 PKGNAME= apache-1.3.11 d20 1 a20 1 MAINTAINER= tv@@netbsd.org d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.5.0-1.3.11 @ 1.44 log @Solaris needs a dependence for db-2.7.7 and fix the broken [ -e test on Solaris. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.43 2000/02/20 22:05:42 wiz Exp $ d20 1 a20 1 MAINTAINER= cjs@@netbsd.org @ 1.43 log @replace 'find' by '${FIND}' where appropriate @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.42 2000/02/05 14:01:11 wiz Exp $ d54 7 d86 1 a86 1 @@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} d101 1 a101 1 @@if [ -e ${PREFIX}/${FILE} ]; then \ @ 1.42 log @replaced tail by ${TAIL} @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.41 2000/01/31 16:35:36 christos Exp $ d79 1 a79 1 @@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} @ 1.41 log @update for 1.3.11 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.40 1999/12/01 00:41:34 bad Exp $ d74 1 a74 1 @@cd ${WRKSRC} && tail +156 \ @ 1.40 log @Adjust offset into ssldoc.patch for mod_ssl-2.4.8. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.39 1999/11/30 20:33:33 tron Exp $ d10 2 a11 2 DISTNAME= apache_1.3.9 PKGNAME= apache-1.3.9p0 d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.4.8-1.3.9 @ 1.39 log @Don't try to disable obsolete configuration rule "STATUS" if "${APACHE_PERF_TUNING}" is set to "YES". Fixes PR pkg/8915 by Damon Brodie. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.38 1999/11/21 22:09:26 tron Exp $ d74 1 a74 1 @@cd ${WRKSRC} && tail +129 \ @ 1.38 log @Update Apache package to version 1.3.9 (SSL Module 2.4.8) using patches suppled by SUNAGAWA Keiki in PR pkg/8819. This version mostly fixes bugs discovered since version 1.3.6. @ text @d1 1 a1 1 # $NetBSD$ a49 1 CONFIGURE_ARGS+= --disable-rule=STATUS @ 1.37 log @Record build options in the BuildInfo file via BUILD_DEFS. These can be displayed using the -B option to pkg_info(1). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.36 1999/07/23 18:20:04 itojun Exp $ a8 1 # d10 2 a11 2 DISTNAME= apache_1.3.6 PKGNAME= apache-1.3.6p0 d25 1 a25 1 SSL_DISTNAME= mod_ssl-2.2.8-1.3.6 d31 1 d57 1 a57 1 BUILD_DEFS+= APACHE_PERF_TUNING APACHE_SUEXEC @ 1.36 log @add CONFLICTS+= apache6-*. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.35 1999/06/05 20:32:17 tron Exp $ d56 2 @ 1.35 log @Fix build when suexec feature is not activated. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.34 1999/05/11 20:26:23 tron Exp $ d24 1 a24 1 CONFLICTS= apache-*modssl-* @ 1.34 log @As pointed out by Todd Vierling we don't need to handle "mod_proxy.so" manually, "bsd.pkg.mk" will do that for us. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.33 1999/05/11 18:32:23 tron Exp $ d93 3 a95 1 @@${TEST} -e ${PREFIX}/${FILE} && ${ECHO} ${FILE} >>${PLIST_SRC} @ 1.33 log @Add a standard start script for Apache. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.32 1999/05/11 16:04:03 tron Exp $ d92 1 a92 1 .for FILE in lib/httpd/mod_proxy.so man/man8/suexec.8 sbin/suexec a94 1 @@${ECHO} @@dirrm lib/httpd >>${PLIST_SRC} @ 1.32 log @- Check configuration variables properly so that enabling "suexec" support really works. - Add proxy module, "suexec" binary and manual page to package list dynamically. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.31 1999/04/30 23:51:39 tv Exp $ d80 4 a84 1 @@${CP} ${PKGDIR}/PLIST ${PLIST_SRC} d87 1 d91 1 @ 1.31 log @Wow, the mod_ssl distribution site changed right from under me. Update it to the new location. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.30 1999/04/30 17:05:19 tv Exp $ d42 3 a44 1 .if defined(APACHE_SUEXEC) d55 2 d81 10 a90 2 ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs @@${MV} ${PREFIX}/lib/httpd/libproxy.so ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || ${MKDIR} ${PREFIX}/lib/httpd @ 1.30 log @Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl now makes use of OpenSSL. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.29 1999/02/20 22:48:44 hubertf Exp $ d15 1 a15 1 ftp://ftp.engelschall.com/sw/mod_ssl/ \ @ 1.29 log @Fix CONFLICTS (remove redundancy, mostly) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.28 1998/12/07 16:20:39 tv Exp $ d11 2 a12 2 DISTNAME= apache_1.3.3 PKGNAME= apache-1.3.3.2 d15 1 a15 1 http://www.engelschall.com/sw/mod_ssl/distrib/ \ d26 1 a26 1 SSL_DISTNAME= mod_ssl-2.1.3-1.3.3 d35 1 a43 1 --suexec-userdir=WWW \ d69 4 a73 3 @@cd ${WRKSRC}/src/include && \ ${SED} -e s,@@@@PREFIX@@@@,${PREFIX}, ap_config.h >tmp && \ ${MV} -f tmp ap_config.h d78 1 a78 1 ${INSTALL_DATA_DIR} ${PREFIX}/lib/httpd d83 3 a85 1 CONFIGURE_ARGS+= --enable-module=so @ 1.28 log @- Update mod_ssl's distname to 2.1.3 (does not require an apache version bump; EAPI is unchanged) - Remove restriction of mod_include to disallow "../" or "/" prefixed file names in if Includes (but not IncludesNOEXEC) is set; proposed in Apache PR mod_include/3500 - Add signature for hook function used to do mod_include callbacks (perl-embedded SSI was not working with new 4 argument call) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.27 1998/12/04 17:23:19 tv Exp $ d24 1 a24 1 CONFLICTS= apache-1.3.[012] apache-*modssl-* apache-1.3.3.[01] @ 1.27 log @Bump version to `1.3.3.2' - add `timefmt' argument to ap_include_extern_func's (needed for a couple upcoming XSSI-extending modules). Also fix apxs to use `install' and fix the cgi-bin `preservation' while we're here. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.26 1998/12/03 22:26:52 tv Exp $ d26 1 a26 1 SSL_DISTNAME= mod_ssl-2.1.2-1.3.3 @ 1.26 log @Bump version to "1.3.3.1": Add parse_string to the include_extern interface, and use the EAPI hooks interface for calling external mod_include subs. (Needed to make mod_perl work as a DSO.) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.25 1998/12/03 17:23:52 tv Exp $ d12 1 a12 1 PKGNAME= apache-1.3.3.1 d24 1 a24 1 CONFLICTS= apache-1.3.[012] apache-*modssl-* @ 1.25 log @Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.24 1998/11/12 23:54:33 frueauf Exp $ d12 1 a12 1 PKGNAME= apache-1.3.3.0 @ 1.24 log @Some pkglint nits and add missing rcs ids. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.23 1998/10/05 14:26:01 tv Exp $ d3 6 a8 3 # The apache-modssl pkg .include's us, so that pkg tuning rules work for # both without a major duplication of Makefiles. So we use ?= and += in # many of the constructs up here at top. d11 29 a39 21 DISTNAME= apache_1.3.2 PKGNAME= apache-1.3.2 CATEGORIES= www MASTER_SITES+= http://www.apache.org/dist/ \ http://www.netbsd.org/images/logos/ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif MAINTAINER= cjs@@netbsd.org HOMEPAGE= http://www.apache.org/ EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} CONFLICTS?= apache-1.3.0 apache-1.3.1 apache-modssl-1.3.1 apache-modssl-1.3.2.2012 HAS_CONFIGURE= YES CONFIGURE_ARGS+=--compat --prefix=${PREFIX}/http --exec-prefix=${PREFIX} \ --mandir=${PREFIX}/man --libexecdir=${PREFIX}/lib/apache \ --sbindir=${PREFIX}/sbin --runtimedir=/var/run \ --enable-module=most --enable-module=auth_db \ --disable-module=auth_dbm --with-perl=${PREFIX}/bin/perl CONFIGURE_ENV+= OPTIM='${OPTIM}' OPTIM= -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin\\" d42 3 a44 3 CONFIGURE_ARGS+=--enable-suexec --suexec-caller=www \ --suexec-userdir=WWW \ --suexec-safepath='${PREFIX}/bin:/usr/local/bin:/usr/bin:/bin' d48 3 a50 3 CONFIGURE_ARGS+=--disable-rule=STATUS OPTIM+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations d57 12 d70 3 d76 2 a77 1 ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/http/htdocs a80 5 # Define some modules that are often replaced as shared modules that can be # changed at runtime. This allows an apxs-compiled .so to be "dropped in" # without even changing httpd.conf. # Only those defined here should be in PLIST-mi.shared. d82 1 a82 5 CONFIGURE_ARGS+=--enable-module=so --enable-shared=include .endif .if (${SHLIB_TYPE} == "ELF") CONFIGURE_ENV+= LDFLAGS_SHLIB_EXPORT=-Wl,--export-dynamic @ 1.23 log @Call apache-modssl "apache-modssl-1.3.2.2012". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.22 1998/10/03 22:00:22 tv Exp $ d9 2 a10 2 PKGNAME?= apache-1.3.2 CATEGORIES?= www @ 1.22 log @Update Apaches to 1.3.2. apache-modssl: update mod_ssl to 2.0.12, and rename pkg to "apache-1.3.2-modssl-2.0.12" such that mod_ssl version changes are noted. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.21 1998/10/03 21:01:14 tv Exp $ d20 1 a20 1 CONFLICTS?= apache-1.3.0 apache-1.3.1 apache-modssl-1.3.1 apache-modssl-1.3.2 @ 1.21 log @Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.20 1998/10/02 14:40:13 tv Exp $ d8 2 a9 2 DISTNAME= apache_1.3.1 PKGNAME?= apache-1.3.1 d20 1 a20 1 CONFLICTS?= apache-modssl-1.3.1 @ 1.20 log @Make this work properly on ELF. Use -Wl,--export-dynamic, and no leading symbol underscore, on ELF systems. @ text @d1 5 a5 1 # $NetBSD: Makefile,v 1.19 1998/09/17 18:18:54 cjs Exp $ d8 4 a11 4 DISTNAME= apache_1.3.1 PKGNAME= apache-1.3.1 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ \ d13 1 a13 1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ d19 2 a20 2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} CONFLICTS= apache-modssl-1.3.1 d27 14 d46 3 a48 2 # Create dummy files because there's no way (that I can see --cjs) # to make an empty directory with pkg_add. d50 1 a50 3 touch ${PREFIX}/http/logs/.keep_me touch ${PREFIX}/http/proxy/.keep_me ${CP} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/http/htdocs @ 1.19 log @Fix spelling. (So I don't lose my developer account. :-)) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 1998/09/05 23:14:45 hubertf Exp $ d44 4 @ 1.18 log @Mention NetBSD on the newly created site. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 1998/08/20 15:17:30 tsarna Exp $ d12 1 a12 1 MAINTAINE= cjs@@netbsd.org @ 1.17 log @This conflicts with the apache-modssl pkg @ text @d7 4 a10 1 MASTER_SITES= http://www.apache.org/dist/ d12 1 a12 1 MAINTAINER= cjs@@netbsd.org d15 2 a16 1 CONFLICTS= apache-modssl-1.3.1 d33 1 @ 1.16 log @The Grand Homepagification: - New, optional Makefile variable HOMEPAGE, specifies a URL for the home page of the software if it has one. - The value of HOMEPAGE is used to add a link from the README.html files. - pkglint updated to know about it. The "correct" location for HOMEPAGE in the Makefile is after MAINTAINER, in that same section. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 1998/08/07 23:46:09 cjs Exp $ d12 1 @ 1.15 log @Update to 1.3.1. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 1998/07/21 21:34:09 cjs Exp $ d10 1 @ 1.14 log @* Create the http/logs and http/proxy directories when pkg_add'ing the package (albeit in a rather kludgy way). * Update order of @@dirrm statements in PLIST files so that the pkg_delete deletes the directories properly. * Note in description that proxy support is in. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 1998/06/22 13:14:31 agc Exp $ d4 2 a5 2 DISTNAME= apache_1.3.0 PKGNAME= apache-1.3.0 @ 1.13 log @Update package Makefiles for automatic manual page handling. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 1998/06/06 23:48:20 tv Exp $ d21 6 @ 1.12 log @Update to 1.3.0. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 1998/06/05 11:09:23 frueauf Exp $ a16 3 MAN1= ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1 MAN8= apxs.8 httpd.8 logresolve.8 rotatelogs.8 @ 1.11 log @portlint: remove double entry for htpasswd.1 and add missing htdigest.1. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 1998/06/04 19:38:36 tv Exp $ d4 2 a5 2 DISTNAME= apache_1.3b7 PKGNAME= apache-1.3b7 @ 1.10 log @Update to 1.3b7 and rework the Makefile: - Now uses APACI, Apache's GNU-autoconf-style (but not GNU autoconf) configuration system to configure, build, and install - Enables build and install of all `support' tools - Enables use of shared modules, and compiles mod_include dynamically - Installs the Apache user manual by default. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 1998/06/03 14:01:11 agc Exp $ d18 1 a18 1 MAN1= ab.1 apachectl.1 dbmmanage.1 htpasswd.1 htpasswd.1 @ 1.9 log @Include bsd.prefs.mk, in case VERS_ID is set in /etc/mk.conf @ text @d1 1 a1 2 # $NetBSD: Makefile,v 1.8 1998/05/09 15:24:45 frueauf Exp $ # FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp d4 2 a5 3 DISTNAME= apache_1.3b5 PKGNAME= apache-1.3b5 WRKSRC= ${WRKROOT}/src d11 13 a23 1 WRKROOT= ${WRKDIR}/apache_1.3b5 d25 1 a25 2 CONFIGURE_SCRIPT=Configure HAS_CONFIGURE= YES d27 4 a30 1 HTTP_ROOT= ${PREFIX}/http d32 2 a33 36 CONF_DIR= ${HTTP_ROOT}/conf MAN1= apachectl.1 htpasswd.1 MAN8= httpd.8 .include "../../mk/bsd.prefs.mk" # Set this for local-supplied patch, e.g. # VERS_ID = mods-1.0/me post-build: (cd ${WRKSRC}/support && make) post-patch: @@cd ${WRKSRC} && \ ${SED} -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \ < Configuration > Configuration.new && \ ${MV} Configuration.new Configuration @@cd ${WRKROOT}/conf && \ for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \ ${SED} -e 's#@@@@ServerRoot@@@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \ ${MV} $${I}.new $${I}; \ done @@cd ${WRKROOT}/conf && \ ${SED} -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \ >httpd.conf-dist.new && \ ${MV} httpd.conf-dist.new httpd.conf-dist @@cd ${WRKSRC}/support && \ ${SED} -e 's#/usr/local/apache/logs/#/var/run/#' \ -e 's#/usr/local/apache/src/#${PREFIX}/sbin/#' \ < apachectl >apachectl.new && \ ${MV} apachectl.new apachectl .if defined(VERS_ID) @@cd ${WRKSRC} && \ ${MV} Configuration Configuration.old && \ ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \ < Configuration.old > Configuration a34 34 do-install: ${INSTALL} -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \ ${HTTP_ROOT}/icons ${HTTP_ROOT}/cgi-bin ${HTTP_ROOT}/logs ${INSTALL_PROGRAM} ${WRKSRC}/httpd ${PREFIX}/sbin cd ${WRKSRC}/support && \ ${INSTALL_PROGRAM} htdigest htpasswd logresolve ${PREFIX}/bin cd ${WRKSRC}/support && \ ${INSTALL_SCRIPT} dbmmanage ${PREFIX}/bin cd ${WRKSRC}/support && \ ${INSTALL_SCRIPT} rotatelogs apachectl log_server_status \ ${PREFIX}/sbin ${INSTALL_DATA} -o nobody ${WRKROOT}/icons/* ${HTTP_ROOT}/icons ${INSTALL_MAN} ${WRKSRC}/support/httpd.8 \ ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/support/htpasswd.1 \ ${WRKSRC}/support/apachectl.1 \ ${PREFIX}/man/man1 cd ${WRKROOT}/conf && \ for file in httpd.conf srm.conf access.conf ; do \ if [ ! -f ${CONF_DIR}/$$file ] ; then \ ${INSTALL_DATA} $$file-dist ${CONF_DIR}/$$file ; \ fi ; \ ${INSTALL_DATA} $$file-dist ${CONF_DIR} ; \ done cd ${WRKROOT}/conf && \ for file in mime.types magic ; do \ if [ ! -f ${CONF_DIR}/$$file ] ; then \ ${INSTALL_DATA} $$file ${CONF_DIR} ; \ fi ; \ ${INSTALL_DATA} $$file ${CONF_DIR}/$${file}-dist ; \ done .include "../../mk/bsd.pkg.mk" @ 1.8 log @Mostly cosmetic changes to shut up portlint. Little bugfix for apache. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 1998/04/20 11:56:34 frueauf Exp $ d24 3 a26 1 # Set this for local-supplied patch, e.e. @ 1.7 log @Substitute all obvious FreeBSD ppl as MAINTAINER with packages@@netbsd.org. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 1998/04/15 10:38:51 agc Exp $ a6 1 WRKROOT= ${WRKDIR}/apache_1.3b5 d13 2 d46 1 a46 1 -e 's#/usr/local/apache/src/#/usr/pkg/sbin/#' \ @ 1.6 log @Use the bsd.pkg.mk and bsd.pkg.subdir.mk files in the pkgsrc tree. Remove redundant (and sometimes erroneous) comments. @ text @d1 1 a1 2 # # $NetBSD: Makefile,v 1.5 1998/03/24 20:34:57 cjs Exp $ @ 1.5 log @Fix install of a script. @ text @a0 5 # New ports collection makefile for: apache # http://www.apache.org # Version required: 1.3b5 # Date created: 18 Mar 1998 # Whom: cjs@@netbsd.org d2 1 a2 1 # $NetBSD: Makefile,v 1.4 1998/03/18 19:16:27 cjs Exp $ d88 1 a88 1 .include @ 1.4 log @Update to 1.3b5 @ text @d7 1 a7 1 # $NetBSD: Makefile,v 1.3 1998/03/06 13:08:54 frueauf Exp $ d66 3 a68 2 ${INSTALL_PROGRAM} htdigest htpasswd dbmmanage logresolve \ ${PREFIX}/bin @ 1.3 log @portlint: sed->${SED}; mv->${MV}; install->${INSTALL}; reorder HTTP_ROOT; @ text @d3 2 a4 2 # Version required: 1.3b3 # Date created: Sun Mar 1 13:41:17 PST 1998 d7 1 a7 1 # $NetBSD: Makefile,v 1.2 1998/03/05 11:42:42 cjs Exp $ d11 3 a13 3 DISTNAME= apache_1.3b3 PKGNAME= apache-1.3b3 WRKROOT= ${WRKDIR}/apache_1.3b3 d63 1 a63 1 ${HTTP_ROOT}/icons ${HTTP_ROOT}/cgi-bin @ 1.2 log @Move some stuff from a patch to a sed script. Add ability to set root of http tree to somewhere other than /usr/pkg/http. Move pid file to /var/run. @ text @d7 1 a7 1 # $NetBSD: Makefile,v 1.1 1998/03/05 08:02:22 cjs Exp $ a17 2 HTTP_ROOT= ${PREFIX}/http d23 2 d37 1 a37 1 sed -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \ d39 1 a39 1 mv Configuration.new Configuration d42 2 a43 2 sed -e 's#@@@@ServerRoot@@@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \ mv $${I}.new $${I}; \ d46 1 a46 1 sed -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \ d48 1 a48 1 mv httpd.conf-dist.new httpd.conf-dist d50 1 a50 1 sed -e 's#/usr/local/apache/logs/#/var/run/#' \ d53 1 a53 1 mv apachectl.new apachectl d56 2 a57 2 mv Configuration Configuration.old && \ sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \ d62 1 a62 1 install -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \ @ 1.1 log @Initial version of apache web server package: 1.3b3. @ text @d7 1 a7 1 # $NetBSD$ d18 2 d25 1 a25 1 CONF_DIR= ${PREFIX}/http/conf d36 9 d46 8 a53 4 for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \ sed -e "s#@@@@ServerRoot@@@@#${PREFIX}/http#g" < $${I} > $${I}.new; \ mv $${I}.new $${I}; \ done d56 3 a58 3 mv Configuration Configuration.old && \ sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \ < Configuration.old > Configuration d62 2 a63 2 install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/http/htdocs \ ${PREFIX}/http/icons ${PREFIX}/http/cgi-bin d71 1 a71 1 ${INSTALL_DATA} -o nobody ${WRKROOT}/icons/* ${PREFIX}/http/icons @