pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/45506: nginx patching is broken



>Number:         45506
>Category:       pkg
>Synopsis:       nginx patching is broken
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Oct 21 13:05:01 +0000 2011
>Originator:     Nikolai Lifanov
>Release:        CentOS 5.7
>Organization:
>Environment:
>Description:
When trying to compile nginx 1.0.4 from either 2011Q3 or current pkgsrc, 
patches fail to apply.

I have updated the patch-aa file to work with new nginx.conf it's patching. The 
solution contains a working port.

Here is what I was seeing.

===> Patching for nginx-1.0.4
=> Applying pkgsrc patches for nginx-1.0.4
1 out of 7 hunks FAILED -- saving rejects to file conf/nginx.conf.rej
Patch /usr/pkgsrc/www/nginx/patches/patch-aa failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/www/nginx/patches/patch-aa
ERROR: 
==========================================================================
ERROR:
ERROR: Some of the selected build options and/or local patches may be 
incompatible.
ERROR: Please try building with fewer options or patches.
ERROR:
ERROR: 
==========================================================================
*** Error code 1

>How-To-Repeat:
Try to compile nginx with any options or none at all.

>Fix:
begin 644 nginx.tar.gz
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
M@O".AN8H#/!0+XT(D=XR%NQHKLF.YL@localhost*O:'I4]^U+B5B%V+7I$B3<$0$H@(1'
M>A-@2).#OL!$ED):<WYR>&\O4Q_R7<&JU9ZTU+>N,(?5J\UEAQDRLDLS\//:
MD"$C1R(0\`%^')$OPB$BOR:U7@SZZ?IV2*V(A7,';D3N+0_ZO[\'8PS7=JVN
M]XA1U['GI)@801VZ<4HEZ!'<74D<&MFA.X)Y543>X*IY<D`3LI'LD:/)\WA$
M>(X#@=4^,0(P+Y_:L1OX:`:BK$+=G[#Z`AG$\0BJ7T1L'@*G">?3$ZYO>;UF
MD_?V9H]-0=-D<S"<9$W;Q'>$6*.1Y]H65J,<V#&-BU$,S`]90S+&00PFL#FT
M8H*[`GQ"]@LA'08Q-2W'"4F1I(_,#?Q/(8820;"VY?TOV2W@P2X:Q;MD/Z'W
M7!OV"]!.\3@B!?0G)MOD8T9XGGFW@$UAAK1'0QJ^2"-!Q3J85A\R[Z:Y/V/U
M'ZS0P=-E0;B[SUP.H\,O%\AXC<QM`XS9I)5G$)^IZ_-,2=L!#^R86EK)P$]D
M\#JV1Z8?C,;18)*`GE8Y/I+`&RL5_(`7B2(DY%A.>V"%$8W)7>`>%\,)*_/9
MP?T%I04\+>=K0>Y,;5#*J#JDG*IK"KCF!!]XCCE37B9EX0GHMT(6F[#ST,D'
M.Q8]_9K!1,/!!M2D(X,<:C+\SC3?A-WI5^Y^1J`I\*!!%P@#%_A1X$<E9')0
M^^T<7D^FR5^%ZZ<9>2<;;^(!):T/K<23L/LS:B,+QGK@I&#4PS;;0-TDV2B)
M\$^J'HNL070#&T0_7M`@^&MZ1#\"3Y0A48%!P=L%R#-B&0U&B_#8H7E"^-%4
M\WWCLGY=NZI#"R>,%%)$_FQBD.IM1J6Y"F1]W"SI**O-<Y#G>,1\_FG%<RWO
M4/^1</W']@:))P]LE_T1<7N)#/8CX@3VF%W!P!9;L>6/6<L?SVEY5D^^\XKQ
M2]AE*?R;Y;D62,&"[GI`PQ)[G/KB&3V<V-S$'3Y7OWS2,OV;X"\WN]>)KB8M
MQR.[(O(L2=(BIB,/>T?PYF;"O^V.@$_4N\#_4_#YK<?Z\V`Z__L:)W\YK+C_
M1Y4-69=5O/]+5K1M_&\C,"O_=9_\Y?#[XW^*+&WG_QN!;?SOQX:<_:_YY"^'
MI?8OY^-_JKJ-_V\&\O&_K;'_6#!K_^L^^<MAF?VK+/Z7'?\IQO;^I\T`/_:%
M,;U2&M<[IS:1)")6JI)<E75V,@;C>LD)\3+[GD:+\"F].I9%!CM6S$.(F=L^
MTQ#BE75'D0@BZAP38XA2&FR4^*E#P&27ZP&:]B)6>F81Z2DO8@8CMEI:&MXA
MKE3^2!W2M&&ZIS%<N:I,<'^L^&7F_M]$..LO8TG\3Y=D.7?_IZ+HV_M_-P*9
M>]Y2!>`G`/3E)X#/P49Q2>YD9R=S]):]QM6Z#KPO?#FOOZ_=7MZ8D[=/PEGM
MIG[1;#<8!BB@<%7KW-3;9J=QPU[AVD^U7([X`<%PG"BH`'B-ZQOXJ;<!BU7E
ME%<>YRO"A^95O05N:$J!QW9@2E,6SII75_7K&TB[S!QGQ,WLR7(:F1Q=Y*NF
M_*UPV3BK7W>0IERT/6L<T2+,CP0!EP:3'?)FY[;5:K:!-D80B@Z-8L<-A5*Z
MG+A;*I7A/[@>G%GA&A;ZH5U!F(8\_YHVH9`)>^9?GM=N:E#<7UFS)G?7/96=
M;CF+Q%?@<SA>T)]!XL&O'%(X]@7AW6WC\AP8>]\YA-29<DFV`)(EQ%L#^>B8
M0`ZS3EEC:8R?7")[ETEEM<DD/4VI9I+P^:F:0^14ZF?-3FD&[X1]3P6,TF&8
MJ"@YQ`G]A%E>.+L-,8<)3TUH@\8U%`MO3,"[;)[5+NN0ZV3GD4;"AUJ''0II
M7-RV47'PW>39K+4OL`V*1:S.R0SM>5C],!B/3G+\SL%[<.-!T7.*T-&=%"\+
M7_B!%!"]V_U$BA^]HV)[YN4\&JB:[N>3"=X\'+QZL0B=_V"*QJYCG(>+NP`F
MN#-+Z4_9?0+S:N(Z:<8%UVO/R^4%]MULME2:23Y$F)>1170@>W\V][/+O^?E
M15>S..LT!+8PK^VYU(^+&+\LQG0X6L`!1S-9F!/1%M)C[NLE2@SA91I)G.,E
M*CT>"6%D5O!U&?EW;M\Q6^$>2:A?L"<T\8E"S5F"!SS6?:!?REX@G8OID.0R
M:))<^4P^"4!Z&LDFF:-<Z:7+0@EC\2S:"AD*7Y*2N/Z;DU(Q@8L"-[H4OF"&
M)_)<M9,4H80AW"`4A,P%JQ.7+C2N.S>UR\O:3:-Y#9TC.CE&ZJIVS:C@M=H$
M+6M^0((QP'A;&*^`[O+G.B-]F'&@B24)S8]IL3LYI9TDF:UZ^PHSYX5/9MP6
MF?5.1#1$,>U);D"OZMCK=L>N!]TFR+YS8YY=UCH=WJBH7%'R&AKDHEYB;TYV
M0'>*_![5<4@3!":*%"&_W2BA43]/$8J4[$='SZ-X1\]$=M3?SV<_G.:?#6T?
MY5IKE;SI9I.CG!!6R<MW1!W-M/@J^9*=4T>SPL&<0C)=,QF):3_/&<J[L$78
MG(6\@\ZZ@NF<"^S?"8KI84T!]"G1?K/5;EZT:U>H0Q_;/W?:9T_EH/O/1(L)
MCA[9$.MIMK-)/,(BL\W01XW-$L^9[I3\'-.>&/`+]&:N9I]'</;N]F64,K'$
M1;0RE[QGJ('7R!+#>_F3*_GG-N(S3_/<A3LP'?+*O\%0H<QLUW/].X7)<I&S
MO^NSY&\]H]G"[X'I_']JKNLN8\G\7Q$-Z=GZW_;O?VP&,O/_J0+P%8!D10SO
M`5!QE[^F514-1R-Q3$/JI*L`V)<V6SB,81.\DYW,BQ)WU*R[Y9/D^GF:=K+C
M6/>DY]V3?AP$'M[80V.=3<'Y&)8,Z=!F^Y1&=DCY8(=M>PNIY;DCW!%"HG&7
ML#^QD91Q<0&^+EL&RPJ84$]<4DRGH#L\TR)?-M-UE=P>^0L,<^/'-QG6JE=`
M]>`9@2BYW0?,B?J`D7>>BZ9NR+:)>UR&@3/VZ$(\MBTQ@X=]E-M;7$GD_WDM
MN7/'M&?.G7K1PM*#<5S$3"^E)[LN\;8GNFHE01$.7N88,%8E!AJUA!A@K$H,
M]&L),<!8E1C7\\7T^NR>*'-$PQ[#7)7NU&06TT:<&4+SZ"3VMI#*1+XIIK-J
M%;G)+FE*CK0J2>8N%E-T1_?Z4AK,"QQDIY8S?Z\G\R=^DG4<;AXE0A:9&_BG
M`Z%UV_F`,UKF_4S&&R8DG!7%DEZ1I\ND?':&>9Z2:PL%MA):FGUYDJYJ(BE.
MJ11YEAVS!4XG>/#Q'K2H/*]%+,<I\BPG8/T)762#M\\R<?-&F97+M^ZXMK"%
0+6QA"_\G^`\Y*]49`'@`````
`
end



Home | Main Index | Thread Index | Old Index