If you update your kernel to -stable, you must also update your userland
binaries to -stable, and your ports tree.  When running -stable you
don't need the patches, since the patches are applied against -release
and are already incorporated into -stable.

Basically, choose one.  Either run -release and patches, or run -stable
and don't patch.  You've already upgraded your kernel to -stable so it's
simpler for you to completely ignore patches and finish upgrading to
-stable.

Federico Giannici wrote:
> Joel Goguen wrote:
>> Don't patch.  Start with an empty /usr/src/ and extract fresh archives,
>> then update them to -stable and recompile *ALL* userland binaries.
>> These pages are your friend for this:
> 
> OK, I can do it, but then why the patches exist if I HAVE to use -stable???
> 
> I extracted a fresh -release tree and applied the patch, following all
> the steps. Why it shouldn't work???
> 
> Thanks.
> 
> 
>> http://www.openbsd.org/anoncvs.html
>> http://www.openbsd.org/stable.html
>>
>> Federico Giannici wrote:
>>> Federico Giannici wrote:
>>>> Darrin Chandler wrote:
>>>>> On Sat, Nov 11, 2006 at 04:25:29PM +0100, Federico Giannici wrote:
>>>>>> I have written that I upgraded to -stable the KERNEL (src/sys) and
>>>>>> compiled a new one.
>>>>> Good. Then you should have compiled userland as well and forgotten
>>>>> about
>>>>> the patching process, since you already had the patch as part of
>>>>> -stable.
>>>>>
>>>>>> THEN I extracted the src.tar.gz archive, patched it with
>>>>>> "002_openssl.patch", and note that the patch SUCCEDED.
>>>>> So you moved your source back to -release and the patch applied.
>>>>> Moving
>>>>> back to -release sources on a -stable system isn't a good idea.
>>>> Humm...
>>>> So you are saying that it's not possible compile a portion of a
>>>> patched userland with sources of a -stable kernel?
>>> I restarted from an empty "/usr/src" and the error occurred again!
>>>
>>> Here are the steps I have done:
>>>
>>> cd /usr/src
>>> tar xvzf /usr/local/storage/openbsd/40/src.tar.gz
>>> tar xvzf /usr/local/storage/openbsd/40/sys.tar.gz
>>> patch -p0 < /usr/local/storage/openbsd/40/002_openssl.patch
>>> cd lib/libssl
>>> make obj
>>> make depend
>>> make includes
>>> make
>>>
>>> And this is the output:
>>>
>>> ===> crypto
>>> cc -O2 -pipe -g -DL_ENDIAN -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_IDEA
>>> -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM -DOPENSSL_NO_RC5
>>> -DOPENSSL_NO_KRB5 -DOPENSSL_NO_MDC2 -DNO_WINDOWS_BRAINDEATH
>>> -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA
>>> -DOPENSSL_NO_HW_NURON -DOPENSSL_NO_HW_UBSEC -DOPENSSL_NO_HW_AEP
>>> -DOPENSSL_NO_HW_SUREWARE -DOPENSSL_NO_HW_4758_CCA
>>> -I/usr/src/lib/libssl/crypto/../src
>>> -I/usr/src/lib/libssl/crypto/../src/crypto
>>> -I/usr/src/lib/libssl/crypto/obj   -c
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_eay.c -o rsa_eay.o
>>> cc -O2 -pipe -g -DL_ENDIAN -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_IDEA
>>> -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM -DOPENSSL_NO_RC5
>>> -DOPENSSL_NO_KRB5 -DOPENSSL_NO_MDC2 -DNO_WINDOWS_BRAINDEATH
>>> -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA
>>> -DOPENSSL_NO_HW_NURON -DOPENSSL_NO_HW_UBSEC -DOPENSSL_NO_HW_AEP
>>> -DOPENSSL_NO_HW_SUREWARE -DOPENSSL_NO_HW_4758_CCA
>>> -I/usr/src/lib/libssl/crypto/../src
>>> -I/usr/src/lib/libssl/crypto/../src/crypto
>>> -I/usr/src/lib/libssl/crypto/obj   -c
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_err.c -o rsa_err.o
>>> cc -O2 -pipe -g -DL_ENDIAN -DDSO_DLFCN -DHAVE_DLFCN_H -DOPENSSL_NO_IDEA
>>> -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM -DOPENSSL_NO_RC5
>>> -DOPENSSL_NO_KRB5 -DOPENSSL_NO_MDC2 -DNO_WINDOWS_BRAINDEATH
>>> -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA
>>> -DOPENSSL_NO_HW_NURON -DOPENSSL_NO_HW_UBSEC -DOPENSSL_NO_HW_AEP
>>> -DOPENSSL_NO_HW_SUREWARE -DOPENSSL_NO_HW_4758_CCA
>>> -I/usr/src/lib/libssl/crypto/../src
>>> -I/usr/src/lib/libssl/crypto/../src/crypto
>>> -I/usr/src/lib/libssl/crypto/obj   -c
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c -o rsa_x931.o
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c: In function
>>> `RSA_X931_hash_id':
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c:165: error: `NID_sha256'
>>> undeclared (first use in this function)
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c:165: error: (Each
>>> undeclared identifier is reported only once
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c:165: error: for each
>>> function it appears in.)
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c:168: error: `NID_sha384'
>>> undeclared (first use in this function)
>>> /usr/src/lib/libssl/src/crypto/rsa/rsa_x931.c:171: error: `NID_sha512'
>>> undeclared (first use in this function)
>>> *** Error code 1
>>>
>>> Stop in /usr/src/lib/libssl/crypto.
>>> *** Error code 1
>>>
>>> Stop in /usr/src/lib/libssl.
>>>
>>>
>>>
>>> Where is the mistake?
>>>
>>> Thanks.
>>>
>>
>>
> 
> 


-- 
Joel Goguen
Bachelor of Computer Science III
University of New Brunswick
http://iapetus.dyndns.org/

Reply via email to